Python2.5 fixes

celery/tests/utilities/test_local.py

@@ -1,6 +1,10 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
+import sys
+
+from nose import SkipTest
+
 from celery.local import Proxy, PromiseProxy, maybe_evaluate, try_import
 
 from celery.tests.utils import Case
@@ -71,6 +75,8 @@ class test_Proxy(Case):
         self.assertEqual(unicode(x), "REPR")
 
     def test_dir(self):
+        if sys.version_info < (2, 6):
+            raise SkipTest("Not relevant for Py2.5")
 
         class X(object):
 
@@ -88,6 +94,8 @@ class test_Proxy(Case):
         self.assertListEqual(dir(y), [])
 
     def test_getsetdel_attr(self):
+        if sys.version_info < (2, 6):
+            raise SkipTest("Not relevant for Py2.5")
 
         class X(object):
             a = 1

celery/tests/utilities/test_mail.py

@@ -43,7 +43,7 @@ class test_Mailer(Case):
         self.assertEqual(sets[1][0], (10, ))
         mailer._send.assert_called_with(msg)
 
-    @patch("smtplib.SMTP_SSL")
+    @patch("smtplib.SMTP_SSL", create=True)
     def test_send_ssl_tls(self, SMTP_SSL):
         mailer = Mailer(use_ssl=True, use_tls=True)
         client = SMTP_SSL.return_value = Mock()

celery/tests/utilities/test_platforms.py

@@ -576,7 +576,7 @@ if not current_app.IS_WINDOWS:
 
     class test_setgroups(Case):
 
-        @patch("os.setgroups")
+        @patch("os.setgroups", create=True)
         def test_setgroups_hack_ValueError(self, setgroups):
 
             def on_setgroups(groups):
@@ -591,7 +591,7 @@ if not current_app.IS_WINDOWS:
             with self.assertRaises(ValueError):
                 _setgroups_hack(range(400))
 
-        @patch("os.setgroups")
+        @patch("os.setgroups", create=True)
         def test_setgroups_hack_OSError(self, setgroups):
             exc = OSError()
             exc.errno = errno.EINVAL