Ticket #1652: patch.diff

turbogears/identity/tests/test_visit.py

@@ -27 +27 @@
         cherrypy.root = VisitRoot()
 
     def tearDown(self):
+        turbogears.startup.stopTurboGears()
         turbogears.config.update({'visit.timeout': self._visit_timeout})
         turbogears.config.update({'visit.on': self._visit_on})
 
@@ -38 +39 @@
         # the following command shuts down the visit framework properly
         # the test still passes without it, but exceptions are thrown later
         # once nose wants to quit.
-        turbogears.startup.stopTurboGears()
 
     def test_new_visit(self):
         "Test that we can see a new visit on the server."
         testutil.create_request("/")
         assert turbogears.visit.current().is_new
-        turbogears.startup.stopTurboGears()
 
     def test_old_visit(self):
         "Test if we can track a visitor over time."
@@ -53 +52 @@
         morsel = cherrypy.response.simple_cookie[self.cookie_name]
         testutil.create_request("/", headers=cookie_header(morsel))
         assert not turbogears.visit.current().is_new
-        turbogears.startup.stopTurboGears()
 
     def test_cookie_expires(self):
         "Test if the visit timeout mechanism works."
@@ -67 +65 @@
             'cookie values should not match'
         assert turbogears.visit.current().is_new, \
             'this should be a new visit, as the cookie has expired'
-        turbogears.startup.stopTurboGears()
+
+    def test_cookie_re_sent(self):
+        "Test whether the visit cookie is re-sent with new expiry time."
+        testutil.create_request('/')
+        morsel = cherrypy.response.simple_cookie[self.cookie_name]
+        exp1 = time.strptime(morsel['expires'], '%a, %d-%b-%Y %H:%M:%S GMT')
+        # sleep one second to ensure that we get a new expiry time.
+        time.sleep(1)
+        headers = {'Cookie': morsel.output(header='')[1:]}
+        testutil.create_request('/', headers=headers)
+        assert self.cookie_name in cherrypy.response.simple_cookie
+        morsel = cherrypy.response.simple_cookie[self.cookie_name]
+        exp2 = time.strptime(morsel['expires'], '%a, %d-%b-%Y %H:%M:%S GMT')
+        assert exp1 < exp2

turbogears/visit/api.py

@@ -229 +229 @@
             if not visit:
                 visit_key = self._generate_key()
                 visit = _manager.new_visit_with_key(visit_key)
-                self.send_cookie(visit_key)
 
+            self.send_cookie(visit_key)
+
             set_current(visit)
 
         # Inform all the plugins that a request has been made for the current