Ticket #9978: 9788.diff

django/test/client.py

@@ -414 +414 @@
         Causes the authenticated user to be logged out.
         """
         session = __import__(settings.SESSION_ENGINE, {}, {}, ['']).SessionStore()
-        session.delete(session_key=self.cookies[settings.SESSION_COOKIE_NAME].value)
+        if self.cookies.has_key(settings.SESSION_COOKIE_NAME):
+            session.delete(session_key=self.cookies[settings.SESSION_COOKIE_NAME].value)
         self.cookies = SimpleCookie()

tests/modeltests/test_client/models.py

@@ -70 +70 @@
         self.assertEqual(response.context['data'], '37')
         self.assertEqual(response.template.name, 'POST Template')
         self.failUnless('Data received' in response.content)
-    
+
     def test_response_headers(self):
         "Check the value of HTTP headers returned in a response"
         response = self.client.get("/test_client/header_view/")
-        
+
         self.assertEquals(response['X-DJANGO-TEST'], 'Slartibartfast')
-        
+
     def test_raw_post(self):
         "POST raw data (with a content type) to a view"
         test_doc = """<?xml version="1.0" encoding="utf-8"?><library><book><title>Blink</title><author>Malcolm Gladwell</author></book></library>"""
@@ -326 +326 @@
         response = self.client.get('/test_client/login_protected_view/')
         self.assertRedirects(response, 'http://testserver/accounts/login/?next=/test_client/login_protected_view/')
 
+
+    def test_null_logout(self):
+        #Logging out should do nothing, not raise a KeyError
+        #Ref ticket #9978
+        self.client.logout()
+
     def test_view_with_permissions(self):
         "Request a page that is protected with @permission_required"
 
@@ -417 +423 @@
         self.assertEqual(mail.outbox[1].from_email, 'from@example.com')
         self.assertEqual(mail.outbox[1].to[0], 'second@example.com')
         self.assertEqual(mail.outbox[1].to[1], 'third@example.com')
-