Tests passing

celery/tests/app/test_amqp.py

@@ -61,7 +61,7 @@ class test_PublisherPool(AppCase):
             delattr(self.app, '_pool')
         except AttributeError:
             pass
-        self.app.amqp.__dict__.pop('producer_pool', None)
+        self.app.amqp._producer_pool = None
         try:
             pool = self.app.amqp.producer_pool
             self.assertEqual(pool.limit, self.app.pool.limit)
@@ -83,7 +83,7 @@ class test_PublisherPool(AppCase):
             delattr(self.app, '_pool')
         except AttributeError:
             pass
-        self.app.amqp.__dict__.pop('producer_pool', None)
+        self.app.amqp._producer_pool = None
         try:
             pool = self.app.amqp.producer_pool
             self.assertEqual(pool.limit, self.app.pool.limit)

celery/tests/bin/test_celeryd_detach.py

@@ -85,7 +85,7 @@ class test_Command(Case):
         x.execute_from_commandline(self.argv)
         self.assertTrue(exit.called)
         detach.assert_called_with(path=x.execv_path, uid=None, gid=None,
-            umask=0, working_directory=None, fake=False,
+            umask=0, fake=False,
             logfile='/var/log', pidfile='celeryd.pid',
             argv=['-m', 'celery.bin.celeryd', '-c', '1', '-lDEBUG',
                   '--logfile=/var/log', '--pidfile=celeryd.pid',

celery/tests/worker/test_control.py

@@ -434,7 +434,7 @@ class test_ControlPanel(Case):
 
         self.assertTrue(consumer.controller.pool.restart.called)
         self.assertFalse(_reload.called)
-        self.assertEqual([call('bar'), call('foo')],
+        self.assertItemsEqual([call('bar'), call('foo')],
                           _import.call_args_list)
 
     def test_pool_restart_reload_modules(self):