some more fixes

celery/tests/test_serialization.py

@@ -8,8 +8,8 @@ class TestAAPickle(unittest.TestCase):
     def test_no_cpickle(self):
         from celery.tests.utils import mask_modules
         prev = sys.modules.pop("billiard.serialization")
-        with mask_modules("cPickle"):
-            from billiard.serialization import pickle
-            import pickle as orig_pickle
-            self.assertTrue(pickle.dumps is orig_pickle.dumps)
+        mask_modules("cPickle")
+        from billiard.serialization import pickle
+        import pickle as orig_pickle
+        self.assertTrue(pickle.dumps is orig_pickle.dumps)
         sys.modules["billiard.serialization"] = prev

celery/tests/test_task_http.py

@@ -31,7 +31,7 @@ def mock_urlopen(response_method):
 
     urllib2.urlopen = _mocked
 
-    yield
+    yield True
 
     urllib2.urlopen = urlopen
 

celery/tests/test_utils.py

@@ -36,12 +36,12 @@ class TestGenUniqueId(unittest.TestCase):
         from celery.tests.utils import mask_modules
         old_utils = sys.modules.pop("celery.utils")
         try:
-            with mask_modules("ctypes"):
-                from celery.utils import ctypes, gen_unique_id
-                self.assertTrue(ctypes is None)
-                uuid = gen_unique_id()
-                self.assertTrue(uuid)
-                self.assertTrue(isinstance(uuid, basestring))
+            mask_modules("ctypes")
+            from celery.utils import ctypes, gen_unique_id
+            self.assertTrue(ctypes is None)
+            uuid = gen_unique_id()
+            self.assertTrue(uuid)
+            self.assertTrue(isinstance(uuid, basestring))
         finally:
             sys.modules["celery.utils"] = old_utils
 

celery/tests/test_worker.py

@@ -222,7 +222,7 @@ class TestCarrotListener(unittest.TestCase):
         m = create_message(backend, unknown={"baz": "!!!"})
         l.event_dispatcher = MockEventDispatcher()
         l.control_dispatch = MockControlDispatch()
-        log catch_warnings(record=True)
+        log = catch_warnings(record=True)
         l.receive_message(m.decode(), m)
         self.assertTrue(log)
         self.assertTrue("unknown message" in log[0].message.args[0])

celery/tests/test_worker_job.py

@@ -226,7 +226,7 @@ class TestTaskWrapper(unittest.TestCase):
 
         WorkerTaskTrace.execute = _error_exec
         try:
-            log catch_warnings(record=True)
+            log = catch_warnings(record=True)
             res = execute_and_trace(mytask.name, gen_unique_id(),
                                     [4], {})
             self.assertTrue(isinstance(res, ExceptionInfo))

celery/tests/utils.py

@@ -54,7 +54,7 @@ def eager_tasks():
     prev = conf.ALWAYS_EAGER
     conf.ALWAYS_EAGER = True
 
-    yield
+    yield True
 
     conf.ALWAYS_EAGER = prev