Fixed broken tests

celery/tests/test_beat.py

@@ -4,6 +4,7 @@ import unittest2 as unittest
 from datetime import datetime, timedelta
 
 from celery import beat
+from celery.app import app_or_default
 from celery.result import AsyncResult
 from celery.schedules import schedule
 from celery.utils import gen_unique_id
@@ -237,7 +238,9 @@ class test_Service(unittest.TestCase):
         s = beat.Service(scheduler_cls=PersistentScheduler)
         self.assertIsInstance(s.schedule, dict)
         self.assertIsInstance(s.scheduler, beat.Scheduler)
-        self.assertListEqual(s.schedule.keys(), sh.keys())
+        scheduled = s.schedule.keys()
+        for task_name in sh.keys():
+            self.assertIn(task_name, scheduled)
 
         s.sync()
         self.assertTrue(sh.closed)

celery/tests/test_bin/test_base.py

@@ -22,13 +22,6 @@ class MockCommand(Command):
 
 class test_Command(unittest.TestCase):
 
-    def test_defaults(self):
-        cmd1 = Command(defaults=None)
-        self.assertTrue(cmd1.defaults)
-
-        cmd2 = Command(defaults=AttributeDict({"foo": "bar"}))
-        self.assertTrue(cmd2.defaults)
-
     def test_get_options(self):
         cmd = Command()
         cmd.option_list = (1, 2, 3)

celery/tests/test_task.py

@@ -8,7 +8,6 @@ from pyparsing import ParseException
 from celery import task
 from celery.app import app_or_default
 from celery import messaging
-from celery.backends import default_backend
 from celery.decorators import task as task_dec
 from celery.exceptions import RetryTaskError
 from celery.execute import send_task
@@ -360,13 +359,10 @@ class TestCeleryTasks(unittest.TestCase):
             p = IncrementCounterTask.get_publisher(exchange="foo",
                                                    connection="bar")
             self.assertEqual(p.kwargs["exchange"], "foo")
-<<<<<<< HEAD
             self.assertTrue(p._declared)
-=======
             p = IncrementCounterTask.get_publisher(exchange_type="fanout",
                                                    connection="bar")
             self.assertEqual(p.kwargs["exchange_type"], "fanout")
->>>>>>> 503136a... 91% coverage
         finally:
             amqp.TaskPublisher = old_pub