Backported SimpleCookie test fix for Python 2.5 from changeset:1272

1 files changed, 21 insertions, 9 deletions

diff --git a/cherrypy/test/test_core.py b/cherrypy/test/test_core.py
index 6ebae781..60a036e4 100644
--- a/cherrypy/test/test_core.py
+++ b/cherrypy/test/test_core.py
@@ -871,15 +871,27 @@ class CoreRequestHandlingTest(helper.CPWebCase):
         self.assertBody(data)
     
     def testCookies(self):
-        self.getPage("/cookies/single?name=First",
-                     [('Cookie', 'First=Dinsdale;')])
-        self.assertHeader('Set-Cookie', 'First=Dinsdale;')
-        
-        self.getPage("/cookies/multiple?names=First&names=Last",
-                     [('Cookie', 'First=Dinsdale; Last=Piranha;'),
-                      ])
-        self.assertHeader('Set-Cookie', 'First=Dinsdale;')
-        self.assertHeader('Set-Cookie', 'Last=Piranha;')
+        import sys
+        if sys.version_info >= (2, 5):
+            self.getPage("/cookies/single?name=First",
+                         [('Cookie', 'First=Dinsdale;')])
+            self.assertHeader('Set-Cookie', 'First=Dinsdale')
+            
+            self.getPage("/cookies/multiple?names=First&names=Last",
+                         [('Cookie', 'First=Dinsdale; Last=Piranha;'),
+                          ])
+            self.assertHeader('Set-Cookie', 'First=Dinsdale')
+            self.assertHeader('Set-Cookie', 'Last=Piranha')
+        else:
+            self.getPage("/cookies/single?name=First",
+                         [('Cookie', 'First=Dinsdale;')])
+            self.assertHeader('Set-Cookie', 'First=Dinsdale;')
+            
+            self.getPage("/cookies/multiple?names=First&names=Last",
+                         [('Cookie', 'First=Dinsdale; Last=Piranha;'),
+                          ])
+            self.assertHeader('Set-Cookie', 'First=Dinsdale;')
+            self.assertHeader('Set-Cookie', 'Last=Piranha;')
     
     def testMaxRequestSize(self):
         self.getPage("/", headers=[('From', "x" * 500)])