All test cases now inherits from celery.tests.utils.Case

celery/tests/functional/case.py

@@ -15,7 +15,7 @@ from celery.exceptions import TimeoutError
 from celery.task.control import ping, flatten_reply, inspect
 from celery.utils import qualname
 
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 HOSTNAME = socket.gethostname()
 
@@ -103,7 +103,7 @@ class Worker(object):
         return worker
 
 
-class WorkerCase(unittest.TestCase):
+class WorkerCase(Case):
     hostname = HOSTNAME
     worker = None
 

celery/tests/test_app/__init__.py

@@ -15,7 +15,7 @@ from celery.platforms import pyimplementation
 from celery.utils.serialization import pickle
 
 from celery.tests import config
-from celery.tests.utils import (unittest, mask_modules, platform_pyimp,
+from celery.tests.utils import (Case, mask_modules, platform_pyimp,
                                 sys_platform, pypy_version)
 from celery.utils.mail import ErrorMail
 from kombu.utils import gen_unique_id
@@ -38,7 +38,7 @@ def _get_test_config():
 test_config = _get_test_config()
 
 
-class test_App(unittest.TestCase):
+class test_App(Case):
 
     def setUp(self):
         self.app = Celery(set_as_current=False)
@@ -254,13 +254,13 @@ class test_App(unittest.TestCase):
         self.assertTrue(x)
 
 
-class test_BaseApp(unittest.TestCase):
+class test_BaseApp(Case):
 
     def test_on_init(self):
         BaseApp()
 
 
-class test_defaults(unittest.TestCase):
+class test_defaults(Case):
 
     def test_str_to_bool(self):
         for s in ("false", "no", "0"):
@@ -271,7 +271,7 @@ class test_defaults(unittest.TestCase):
             defaults.str_to_bool("unsure")
 
 
-class test_debugging_utils(unittest.TestCase):
+class test_debugging_utils(Case):
 
     def test_enable_disable_trace(self):
         try:
@@ -283,7 +283,7 @@ class test_debugging_utils(unittest.TestCase):
             _app.disable_trace()
 
 
-class test_compilation(unittest.TestCase):
+class test_compilation(Case):
     _clean = ("celery.app.base", )
 
     def setUp(self):
@@ -299,7 +299,7 @@ class test_compilation(unittest.TestCase):
             __import__("celery.app.base")
 
 
-class test_pyimplementation(unittest.TestCase):
+class test_pyimplementation(Case):
 
     def test_platform_python_implementation(self):
         with platform_pyimp(lambda: "Xython"):

celery/tests/test_app/test_annotations.py

@@ -4,7 +4,7 @@ from celery.app.annotations import MapAnnotation, prepare
 from celery.task import task
 from celery.utils import qualname
 
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 @task
@@ -21,7 +21,7 @@ class MyAnnotation(object):
     foo = 65
 
 
-class test_MapAnnotation(unittest.TestCase):
+class test_MapAnnotation(Case):
 
     def test_annotate(self):
         x = MapAnnotation({add.name: {"foo": 1}})
@@ -36,7 +36,7 @@ class test_MapAnnotation(unittest.TestCase):
         self.assertIsNone(x.annotate_any())
 
 
-class test_prepare(unittest.TestCase):
+class test_prepare(Case):
 
     def test_dict_to_MapAnnotation(self):
         x = prepare({add.name: {"foo": 3}})

celery/tests/test_app/test_app_defaults.py

@@ -5,10 +5,10 @@ import sys
 
 from importlib import import_module
 
-from celery.tests.utils import unittest, pypy_version, sys_platform
+from celery.tests.utils import Case, pypy_version, sys_platform
 
 
-class test_defaults(unittest.TestCase):
+class test_defaults(Case):
 
     def setUp(self):
         self._prev = sys.modules.pop("celery.app.defaults", None)

celery/tests/test_app/test_beat.py

@@ -11,7 +11,7 @@ from celery.result import AsyncResult
 from celery.schedules import schedule
 from celery.task.base import Task
 from celery.utils import uuid
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class Object(object):
@@ -43,7 +43,7 @@ class MockService(object):
         self.stopped = True
 
 
-class test_ScheduleEntry(unittest.TestCase):
+class test_ScheduleEntry(Case):
     Entry = beat.ScheduleEntry
 
     def create_entry(self, **kwargs):
@@ -150,7 +150,7 @@ always_due = mocked_schedule(True, 1)
 always_pending = mocked_schedule(False, 1)
 
 
-class test_Scheduler(unittest.TestCase):
+class test_Scheduler(Case):
 
     def test_custom_schedule_dict(self):
         custom = {"foo": "bar"}
@@ -248,7 +248,7 @@ class test_Scheduler(unittest.TestCase):
         self.assertEqual(a.schedule["bar"].schedule._next_run_at, 40)
 
 
-class test_Service(unittest.TestCase):
+class test_Service(Case):
 
     def get_service(self):
         sh = MockShelve()
@@ -317,7 +317,7 @@ class test_Service(unittest.TestCase):
         self.assertTrue(s._is_shutdown.isSet())
 
 
-class test_EmbeddedService(unittest.TestCase):
+class test_EmbeddedService(Case):
 
     def test_start_stop_process(self):
         try:

celery/tests/test_app/test_celery.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 import celery
 
 
-class TestInitFile(unittest.TestCase):
+class TestInitFile(Case):
 
     def test_version(self):
         self.assertTrue(celery.VERSION)

celery/tests/test_app/test_log.py

@@ -12,12 +12,11 @@ from celery.log import (setup_logger, setup_task_logger,
                         setup_logging_subsystem)
 from celery.utils import uuid
 from celery.utils.compat import _CompatLoggerAdapter
-from celery.tests.utils import unittest
-from celery.tests.utils import (override_stdouts, wrap_logger,
+from celery.tests.utils import (Case, override_stdouts, wrap_logger,
                                 get_handlers, set_handlers)
 
 
-class test_default_logger(unittest.TestCase):
+class test_default_logger(Case):
 
     def setUp(self):
         self.setup_logger = setup_logger
@@ -144,7 +143,7 @@ class MockLogger(logging.Logger):
         return True
 
 
-class test_CompatLoggerAdapter(unittest.TestCase):
+class test_CompatLoggerAdapter(Case):
     levels = ("debug",
               "info",
               "warn", "warning",

celery/tests/test_app/test_routes.py

@@ -7,7 +7,7 @@ from celery import routes
 from celery import current_app
 from celery.exceptions import QueueNotFound
 from celery.utils import maybe_promise
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 def E(queues):
@@ -47,7 +47,7 @@ d_queue = {"exchange": current_app.conf.CELERY_DEFAULT_EXCHANGE,
            "routing_key": current_app.conf.CELERY_DEFAULT_ROUTING_KEY}
 
 
-class test_MapRoute(unittest.TestCase):
+class test_MapRoute(Case):
 
     @with_queues(foo=a_queue, bar=b_queue)
     def test_route_for_task_expanded_route(self):
@@ -72,7 +72,7 @@ class test_MapRoute(unittest.TestCase):
             expand(route.route_for_task("a"))
 
 
-class test_lookup_route(unittest.TestCase):
+class test_lookup_route(Case):
 
     def test_init_queues(self):
         router = routes.Router(queues=None)
@@ -125,7 +125,7 @@ class test_lookup_route(unittest.TestCase):
                 dict(d_queue, queue=current_app.conf.CELERY_DEFAULT_QUEUE))
 
 
-class test_prepare(unittest.TestCase):
+class test_prepare(Case):
 
     def test_prepare(self):
         from celery.datastructures import LRUCache

celery/tests/test_backends/__init__.py

@@ -4,10 +4,10 @@ from __future__ import with_statement
 from celery import backends
 from celery.backends.amqp import AMQPBackend
 from celery.backends.cache import CacheBackend
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class TestBackends(unittest.TestCase):
+class TestBackends(Case):
 
     def test_get_backend_aliases(self):
         expects = [("amqp", AMQPBackend),

celery/tests/test_backends/test_amqp.py

@@ -15,8 +15,7 @@ from celery.datastructures import ExceptionInfo
 from celery.exceptions import TimeoutError
 from celery.utils import uuid
 
-from celery.tests.utils import unittest
-from celery.tests.utils import sleepdeprived
+from celery.tests.utils import Case, sleepdeprived
 
 
 class SomeClass(object):
@@ -25,7 +24,7 @@ class SomeClass(object):
         self.data = data
 
 
-class test_AMQPBackend(unittest.TestCase):
+class test_AMQPBackend(Case):
 
     def create_backend(self, **opts):
         opts = dict(dict(serializer="pickle", persistent=False), **opts)

celery/tests/test_backends/test_base.py

@@ -20,7 +20,7 @@ from celery.backends.base import BaseBackend, KeyValueStoreBackend
 from celery.backends.base import BaseDictBackend, DisabledBackend
 from celery.utils import uuid
 
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class wrapobject(object):
@@ -38,7 +38,7 @@ Lookalike = subclass_exception("Lookalike", wrapobject, "foo.module")
 b = BaseBackend()
 
 
-class test_serialization(unittest.TestCase):
+class test_serialization(Case):
 
     def test_create_exception_cls(self):
         self.assertTrue(serialization.create_exception_cls("FooError", "m"))
@@ -47,7 +47,7 @@ class test_serialization(unittest.TestCase):
                                                             KeyError))
 
 
-class test_BaseBackend_interface(unittest.TestCase):
+class test_BaseBackend_interface(Case):
 
     def test_get_status(self):
         with self.assertRaises(NotImplementedError):
@@ -108,7 +108,7 @@ class test_BaseBackend_interface(unittest.TestCase):
             tasks[unlock] = p
 
 
-class test_exception_pickle(unittest.TestCase):
+class test_exception_pickle(Case):
 
     def test_oldstyle(self):
         if Oldstyle is None:
@@ -127,7 +127,7 @@ class test_exception_pickle(unittest.TestCase):
         self.assertIsNone(fnpe(Impossible()))
 
 
-class test_prepare_exception(unittest.TestCase):
+class test_prepare_exception(Case):
 
     def test_unpickleable(self):
         x = b.prepare_exception(Unpickleable(1, 2, "foo"))
@@ -193,7 +193,7 @@ class DictBackend(BaseDictBackend):
         self._data.pop(taskset_id, None)
 
 
-class test_BaseDictBackend(unittest.TestCase):
+class test_BaseDictBackend(Case):
 
     def setUp(self):
         self.b = DictBackend()
@@ -232,7 +232,7 @@ class test_BaseDictBackend(unittest.TestCase):
         self.b._cache["task-exists"] = {"result": "task"}
 
 
-class test_KeyValueStoreBackend(unittest.TestCase):
+class test_KeyValueStoreBackend(Case):
 
     def setUp(self):
         self.b = KVBackend()
@@ -277,7 +277,7 @@ class test_KeyValueStoreBackend(unittest.TestCase):
         self.assertIsNone(self.b.restore_taskset("xxx-nonexistant"))
 
 
-class test_KeyValueStoreBackend_interface(unittest.TestCase):
+class test_KeyValueStoreBackend_interface(Case):
 
     def test_get(self):
         with self.assertRaises(NotImplementedError):
@@ -303,7 +303,7 @@ class test_KeyValueStoreBackend_interface(unittest.TestCase):
             KeyValueStoreBackend().forget("a")
 
 
-class test_DisabledBackend(unittest.TestCase):
+class test_DisabledBackend(Case):
 
     def test_store_result(self):
         DisabledBackend().store_result()

celery/tests/test_backends/test_cache.py

@@ -17,7 +17,7 @@ from celery.task import subtask
 from celery.utils import uuid
 from celery.utils.encoding import str_to_bytes
 
-from celery.tests.utils import unittest, mask_modules, reset_modules
+from celery.tests.utils import Case, mask_modules, reset_modules
 
 
 class SomeClass(object):
@@ -26,7 +26,7 @@ class SomeClass(object):
         self.data = data
 
 
-class test_CacheBackend(unittest.TestCase):
+class test_CacheBackend(Case):
 
     def setUp(self):
         self.tb = CacheBackend(backend="memory://")
@@ -150,7 +150,7 @@ class MockCacheMixin(object):
             sys.modules["pylibmc"] = prev
 
 
-class test_get_best_memcache(unittest.TestCase, MockCacheMixin):
+class test_get_best_memcache(Case, MockCacheMixin):
 
     def test_pylibmc(self):
         with self.mock_pylibmc():
@@ -192,7 +192,7 @@ class test_get_best_memcache(unittest.TestCase, MockCacheMixin):
             self.assertTrue(fun())
 
 
-class test_memcache_key(unittest.TestCase, MockCacheMixin):
+class test_memcache_key(Case, MockCacheMixin):
 
     def test_memcache_unicode_key(self):
         with self.mock_memcache():

celery/tests/test_backends/test_database.py

@@ -13,8 +13,7 @@ from celery.exceptions import ImproperlyConfigured
 from celery.result import AsyncResult
 from celery.utils import uuid
 
-from celery.tests.utils import mask_modules
-from celery.tests.utils import unittest
+from celery.tests.utils import Case, mask_modules
 
 try:
     import sqlalchemy  # noqa
@@ -31,7 +30,7 @@ class SomeClass(object):
         self.data = data
 
 
-class test_DatabaseBackend(unittest.TestCase):
+class test_DatabaseBackend(Case):
 
     def setUp(self):
         if sys.platform.startswith("java"):

celery/tests/test_backends/test_mongodb.py

@@ -7,7 +7,7 @@ from nose import SkipTest
 
 from celery import states
 from celery.backends.mongodb import MongoBackend
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 try:
@@ -30,7 +30,7 @@ MONGODB_COLLECTION = "collection1"
 @patch("celery.backends.mongodb.MongoBackend.encode", Mock())
 @patch("pymongo.binary.Binary", Mock())
 @patch("datetime.datetime", Mock())
-class TestBackendMongoDb(unittest.TestCase):
+class TestBackendMongoDb(Case):
 
     def setUp(self):
         if pymongo is None:

celery/tests/test_backends/test_pyredis_compat.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import
 from nose import SkipTest
 
 from celery.exceptions import ImproperlyConfigured
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class test_RedisBackend(unittest.TestCase):
+class test_RedisBackend(Case):
 
     def test_constructor(self):
         from celery.backends import pyredis

celery/tests/test_backends/test_redis.py

@@ -12,8 +12,7 @@ from celery import states
 from celery.utils import uuid
 from celery.backends import redis
 from celery.backends.redis import RedisBackend
-from celery.tests.utils import mask_modules
-from celery.tests.utils import unittest
+from celery.tests.utils import Case, mask_modules
 
 _no_redis_msg = "* Redis %s. Will not execute related tests."
 _no_redis_msg_emitted = False
@@ -57,7 +56,7 @@ def get_redis_or_SkipTest():
         return emit_no_redis_msg("not configured")
 
 
-class TestRedisBackend(unittest.TestCase):
+class TestRedisBackend(Case):
 
     def test_mark_as_done(self):
         tb = get_redis_or_SkipTest()
@@ -95,7 +94,7 @@ class TestRedisBackend(unittest.TestCase):
         self.assertIsInstance(tb.get_result(tid3), KeyError)
 
 
-class TestRedisBackendNoRedis(unittest.TestCase):
+class TestRedisBackendNoRedis(Case):
 
     def test_redis_None_if_redis_not_installed(self):
         prev = sys.modules.pop("celery.backends.redis")

celery/tests/test_backends/test_redis_unit.py

@@ -12,7 +12,7 @@ from celery.task import subtask
 from celery.utils import cached_property, uuid
 from celery.utils.timeutils import timedelta_seconds
 
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class Redis(object):
@@ -57,7 +57,7 @@ class redis(object):
             pass
 
 
-class test_RedisBackend(unittest.TestCase):
+class test_RedisBackend(Case):
 
     def get_backend(self):
         from celery.backends import redis

celery/tests/test_backends/test_tyrant.py

@@ -11,7 +11,7 @@ from celery import states
 from celery.utils import uuid
 from celery.backends import tyrant
 from celery.backends.tyrant import TyrantBackend
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 _no_tyrant_msg = "* Tokyo Tyrant %s. Will not execute related tests."
 _no_tyrant_msg_emitted = False
@@ -51,7 +51,7 @@ def get_tyrant_or_SkipTest():
         raise SkipTest("Tokyo Tyrant not configured")
 
 
-class TestTyrantBackend(unittest.TestCase):
+class TestTyrantBackend(Case):
 
     def test_cached_connection(self):
         tb = get_tyrant_or_SkipTest()

celery/tests/test_bin/test_celeryev.py

@@ -5,8 +5,7 @@ from nose import SkipTest
 from celery.app import app_or_default
 from celery.bin import celeryev
 
-from celery.tests.utils import unittest
-from celery.tests.utils import patch
+from celery.tests.utils import Case, patch
 
 
 class MockCommand(object):
@@ -21,7 +20,7 @@ def proctitle(prog, info=None):
 proctitle.last = ()
 
 
-class test_EvCommand(unittest.TestCase):
+class test_EvCommand(Case):
 
     def setUp(self):
         self.app = app_or_default()

celery/tests/test_compat/test_messaging.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import
 
 from celery import messaging
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class test_compat_messaging_module(unittest.TestCase):
+class test_compat_messaging_module(Case):
 
     def test_with_connection(self):
 

celery/tests/test_concurrency/__init__.py

@@ -6,10 +6,10 @@ import os
 from itertools import count
 
 from celery.concurrency.base import apply_target, BasePool
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class test_BasePool(unittest.TestCase):
+class test_BasePool(Case):
 
     def test_apply_target(self):
 

celery/tests/test_concurrency/test_concurrency_eventlet.py

@@ -5,10 +5,10 @@ import sys
 
 from nose import SkipTest
 
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class EventletCase(unittest.TestCase):
+class EventletCase(Case):
 
     def setUp(self):
         if getattr(sys, "pypy_version_info", None):

celery/tests/test_concurrency/test_concurrency_processes.py

@@ -37,7 +37,7 @@ except ImportError:
 
 from celery.datastructures import ExceptionInfo
 from celery.utils import noop
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class Object(object):   # for writeable attributes.
@@ -117,7 +117,7 @@ class ExeMockTaskPool(mp.TaskPool):
     Pool = ExeMockPool
 
 
-class test_TaskPool(unittest.TestCase):
+class test_TaskPool(Case):
 
     def setUp(self):
         try:

celery/tests/test_concurrency/test_concurrency_solo.py

@@ -4,10 +4,10 @@ import operator
 
 from celery.concurrency import solo
 from celery.utils import noop
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class test_solo_TaskPool(unittest.TestCase):
+class test_solo_TaskPool(Case):
 
     def test_on_start(self):
         x = solo.TaskPool()

celery/tests/test_concurrency/test_pool.py

@@ -8,7 +8,7 @@ import itertools
 from nose import SkipTest
 
 from celery.datastructures import ExceptionInfo
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 def do_something(i):
@@ -26,7 +26,7 @@ def raise_something(i):
         return ExceptionInfo(sys.exc_info())
 
 
-class TestTaskPool(unittest.TestCase):
+class TestTaskPool(Case):
 
     def setUp(self):
         try:

celery/tests/test_events/__init__.py

@@ -5,7 +5,7 @@ import socket
 
 from celery import events
 from celery.app import app_or_default
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class MockProducer(object):
@@ -29,7 +29,7 @@ class MockProducer(object):
         return False
 
 
-class TestEvent(unittest.TestCase):
+class TestEvent(Case):
 
     def test_constructor(self):
         event = events.Event("world war II")
@@ -37,7 +37,7 @@ class TestEvent(unittest.TestCase):
         self.assertTrue(event["timestamp"])
 
 
-class TestEventDispatcher(unittest.TestCase):
+class TestEventDispatcher(Case):
 
     def setUp(self):
         self.app = app_or_default()
@@ -99,7 +99,7 @@ class TestEventDispatcher(unittest.TestCase):
             connection.close()
 
 
-class TestEventReceiver(unittest.TestCase):
+class TestEventReceiver(Case):
 
     def setUp(self):
         self.app = app_or_default()
@@ -181,7 +181,7 @@ class TestEventReceiver(unittest.TestCase):
             connection.close()
 
 
-class test_misc(unittest.TestCase):
+class test_misc(Case):
 
     def setUp(self):
         self.app = app_or_default()

celery/tests/test_events/test_events_cursesmon.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from nose import SkipTest
 
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class MockWindow(object):
@@ -11,7 +11,7 @@ class MockWindow(object):
         return self.y, self.x
 
 
-class TestCursesDisplay(unittest.TestCase):
+class TestCursesDisplay(Case):
 
     def setUp(self):
         try:

celery/tests/test_events/test_events_snapshot.py

@@ -4,7 +4,7 @@ from __future__ import with_statement
 from celery.app import app_or_default
 from celery.events import Events
 from celery.events.snapshot import Polaroid, evcam
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class TRef(object):
@@ -27,7 +27,7 @@ class MockTimer(object):
 timer = MockTimer()
 
 
-class test_Polaroid(unittest.TestCase):
+class test_Polaroid(Case):
 
     def setUp(self):
         self.app = app_or_default()
@@ -98,7 +98,7 @@ class test_Polaroid(unittest.TestCase):
         self.assertEqual(shutter_signal_sent[0], 1)
 
 
-class test_evcam(unittest.TestCase):
+class test_evcam(Case):
 
     class MockReceiver(object):
         raise_keyboard_interrupt = False

celery/tests/test_events/test_events_state.py

@@ -8,7 +8,7 @@ from celery import states
 from celery.events import Event
 from celery.events.state import State, Worker, Task, HEARTBEAT_EXPIRE
 from celery.utils import uuid
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class replay(object):
@@ -93,7 +93,7 @@ class ev_snapshot(replay):
                           uuid=uuid(), hostname=worker))
 
 
-class test_Worker(unittest.TestCase):
+class test_Worker(Case):
 
     def test_survives_missing_timestamp(self):
         worker = Worker(hostname="foo")
@@ -104,7 +104,7 @@ class test_Worker(unittest.TestCase):
         self.assertTrue(repr(Worker(hostname="foo")))
 
 
-class test_Task(unittest.TestCase):
+class test_Task(Case):
 
     def test_info(self):
         task = Task(uuid="abcdefg",
@@ -158,7 +158,7 @@ class test_Task(unittest.TestCase):
         self.assertTrue(repr(Task(uuid="xxx", name="tasks.add")))
 
 
-class test_State(unittest.TestCase):
+class test_State(Case):
 
     def test_repr(self):
         self.assertTrue(repr(State()))

celery/tests/test_security/case.py

@@ -2,10 +2,10 @@ from __future__ import absolute_import
 
 from nose import SkipTest
 
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class SecurityCase(unittest.TestCase):
+class SecurityCase(Case):
 
     def setUp(self):
         try:

celery/tests/test_slow/test_buckets.py

@@ -13,7 +13,7 @@ from celery.utils import timeutils
 from celery.utils import uuid
 from celery.worker import buckets
 
-from celery.tests.utils import skip_if_environ, unittest
+from celery.tests.utils import Case, skip_if_environ
 
 skip_if_disabled = partial(skip_if_environ("SKIP_RLIMITS"))
 
@@ -40,7 +40,7 @@ class MockJob(object):
                 self.task_name, self.task_id, self.args, self.kwargs)
 
 
-class test_TokenBucketQueue(unittest.TestCase):
+class test_TokenBucketQueue(Case):
 
     @skip_if_disabled
     def empty_queue_yields_QueueEmpty(self):
@@ -95,7 +95,7 @@ class test_TokenBucketQueue(unittest.TestCase):
         self.assertEqual(x.get_nowait(), "The quick brown fox")
 
 
-class test_rate_limit_string(unittest.TestCase):
+class test_rate_limit_string(Case):
 
     @skip_if_disabled
     def test_conversion(self):
@@ -126,7 +126,7 @@ class TaskD(Task):
     rate_limit = "1000/m"
 
 
-class test_TaskBucket(unittest.TestCase):
+class test_TaskBucket(Case):
 
     def setUp(self):
         self.registry = TaskRegistry()
@@ -288,7 +288,7 @@ class test_TaskBucket(unittest.TestCase):
         self.assertEqual(sorted(x.items), [1, 2, 3])
 
 
-class test_FastQueue(unittest.TestCase):
+class test_FastQueue(Case):
 
     def test_items(self):
         x = buckets.FastQueue()

celery/tests/test_task/__init__.py

@@ -14,7 +14,7 @@ from celery.schedules import crontab, crontab_parser, ParseException
 from celery.utils import uuid
 from celery.utils.timeutils import parse_iso8601
 
-from celery.tests.utils import with_eager_tasks, unittest, WhateverIO
+from celery.tests.utils import Case, with_eager_tasks, WhateverIO
 
 
 def return_True(*args, **kwargs):
@@ -128,7 +128,7 @@ class RetryTaskCustomExc(task.Task):
                                   countdown=0, exc=exc)
 
 
-class TestTaskRetries(unittest.TestCase):
+class TestTaskRetries(Case):
 
     def test_retry(self):
         RetryTask.max_retries = 3
@@ -204,7 +204,7 @@ class TestTaskRetries(unittest.TestCase):
         self.assertEqual(RetryTask.iterations, 2)
 
 
-class TestCeleryTasks(unittest.TestCase):
+class TestCeleryTasks(Case):
 
     def test_unpickle_task(self):
         import pickle
@@ -420,7 +420,7 @@ class TestCeleryTasks(unittest.TestCase):
         self.assertTrue(logger)
 
 
-class TestTaskSet(unittest.TestCase):
+class TestTaskSet(Case):
 
     @with_eager_tasks
     def test_function_taskset(self):
@@ -467,7 +467,7 @@ class TestTaskSet(unittest.TestCase):
         self.assertTrue(res.taskset_id.startswith(prefix))
 
 
-class TestTaskApply(unittest.TestCase):
+class TestTaskApply(Case):
 
     def test_apply_throw(self):
         with self.assertRaises(KeyError):
@@ -510,7 +510,7 @@ class MyPeriodic(task.PeriodicTask):
     run_every = timedelta(hours=1)
 
 
-class TestPeriodicTask(unittest.TestCase):
+class TestPeriodicTask(Case):
 
     def test_must_have_run_every(self):
         with self.assertRaises(NotImplementedError):
@@ -578,7 +578,7 @@ def patch_crontab_nowfun(cls, retval):
     return create_patcher
 
 
-class test_crontab_parser(unittest.TestCase):
+class test_crontab_parser(Case):
 
     def test_parse_star(self):
         self.assertEqual(crontab_parser(24).parse('*'), set(range(24)))
@@ -653,7 +653,7 @@ class test_crontab_parser(unittest.TestCase):
         self.assertFalse(crontab(minute="1") == object())
 
 
-class test_crontab_remaining_estimate(unittest.TestCase):
+class test_crontab_remaining_estimate(Case):
 
     def next_ocurrance(self, crontab, now):
         crontab.nowfun = lambda: now
@@ -703,7 +703,7 @@ class test_crontab_remaining_estimate(unittest.TestCase):
         self.assertEqual(next, datetime(2010, 9, 13, 0, 5))
 
 
-class test_crontab_is_due(unittest.TestCase):
+class test_crontab_is_due(Case):
 
     def setUp(self):
         self.now = datetime.utcnow()

celery/tests/test_task/test_context.py

@@ -4,7 +4,7 @@ from __future__ import absolute_import
 import threading
 
 from celery.task.base import Context
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 # Retreive the values of all context attributes as a
@@ -37,7 +37,7 @@ class ContextManipulator(threading.Thread):
         self.result = get_context_as_dict(self.ctx)
 
 
-class TestTaskContext(unittest.TestCase):
+class TestTaskContext(Case):
 
     def test_default_context(self):
         # A bit of a tautological test, since it uses the same

celery/tests/test_task/test_execute_trace.py

@@ -5,7 +5,7 @@ from celery import current_app
 from celery import states
 from celery.exceptions import RetryTaskError
 from celery.execute.trace import eager_trace_task
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 @current_app.task
@@ -23,7 +23,7 @@ def trace(task, args=(), kwargs={}, propagate=False):
                       propagate=propagate)
 
 
-class test_trace(unittest.TestCase):
+class test_trace(Case):
 
     def test_trace_successful(self):
         retval, info = trace(add, (2, 2), {})

celery/tests/test_task/test_registry.py

@@ -3,7 +3,7 @@ from __future__ import with_statement
 
 from celery import registry
 from celery.task import Task, PeriodicTask
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class TestTask(Task):
@@ -21,7 +21,7 @@ class TestPeriodicTask(PeriodicTask):
         return True
 
 
-class TestTaskRegistry(unittest.TestCase):
+class TestTaskRegistry(Case):
 
     def assertRegisterUnregisterCls(self, r, task):
         with self.assertRaises(r.NotRegistered):

celery/tests/test_task/test_states.py

@@ -2,10 +2,10 @@ from __future__ import absolute_import
 
 from celery.states import state
 from celery import states
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class test_state_precedence(unittest.TestCase):
+class test_state_precedence(Case):
 
     def test_gt(self):
         self.assertGreater(state(states.SUCCESS),

celery/tests/test_task/test_task_abortable.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from celery.contrib.abortable import AbortableTask, AbortableAsyncResult
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class MyAbortableTask(AbortableTask):
@@ -10,7 +10,7 @@ class MyAbortableTask(AbortableTask):
         return True
 
 
-class TestAbortableTask(unittest.TestCase):
+class TestAbortableTask(Case):
 
     def test_async_result_is_abortable(self):
         t = MyAbortableTask()

celery/tests/test_task/test_task_control.py

@@ -9,7 +9,7 @@ from celery.app import app_or_default
 from celery.task import control
 from celery.task import PingTask
 from celery.utils import uuid
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class MockMailbox(Mailbox):
@@ -41,7 +41,7 @@ def with_mock_broadcast(fun):
     return _resets
 
 
-class test_inspect(unittest.TestCase):
+class test_inspect(Case):
 
     def setUp(self):
         app = app_or_default()
@@ -112,7 +112,7 @@ class test_inspect(unittest.TestCase):
         self.assertIn("cancel_consumer", MockMailbox.sent)
 
 
-class test_Broadcast(unittest.TestCase):
+class test_Broadcast(Case):
 
     def setUp(self):
         self.app = app_or_default()

celery/tests/test_task/test_task_http.py

@@ -14,7 +14,7 @@ except ImportError:  # py3k
 from anyjson import serialize
 
 from celery.task import http
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 from celery.utils.compat import StringIO
 from celery.utils.encoding import from_utf8
 
@@ -53,7 +53,7 @@ def unknown_response():
     return _response(serialize({"status": "u.u.u.u", "retval": True}))
 
 
-class TestEncodings(unittest.TestCase):
+class TestEncodings(Case):
 
     def test_utf8dict(self):
         uk = "foobar"
@@ -65,7 +65,7 @@ class TestEncodings(unittest.TestCase):
             self.assertIsInstance(value, str)
 
 
-class TestMutableURL(unittest.TestCase):
+class TestMutableURL(Case):
 
     def test_url_query(self):
         url = http.MutableURL("http://example.com?x=10&y=20&z=Foo")
@@ -97,7 +97,7 @@ class TestMutableURL(unittest.TestCase):
         self.assertEqual(url.query, {"zzz": "xxx"})
 
 
-class TestHttpDispatch(unittest.TestCase):
+class TestHttpDispatch(Case):
 
     def test_dispatch_success(self):
         logger = logging.getLogger("celery.unittest")
@@ -152,7 +152,7 @@ class TestHttpDispatch(unittest.TestCase):
             self.assertEqual(d.dispatch(), 100)
 
 
-class TestURL(unittest.TestCase):
+class TestURL(Case):
 
     def test_URL_get_async(self):
         http.HttpDispatchTask.app.conf.CELERY_ALWAYS_EAGER = True

celery/tests/test_utils/__init__.py

@@ -4,14 +4,14 @@ from __future__ import with_statement
 from celery import utils
 from celery.utils import promise, mpromise
 from celery.utils.threads import bgThread
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 def double(x):
     return x * 2
 
 
-class test_bgThread_interface(unittest.TestCase):
+class test_bgThread_interface(Case):
 
     def test_body(self):
         x = bgThread()
@@ -19,7 +19,7 @@ class test_bgThread_interface(unittest.TestCase):
             x.body()
 
 
-class test_chunks(unittest.TestCase):
+class test_chunks(Case):
 
     def test_chunks(self):
 
@@ -39,7 +39,7 @@ class test_chunks(unittest.TestCase):
             [[0, 1], [2, 3], [4, 5], [6, 7], [8, 9]])
 
 
-class test_utils(unittest.TestCase):
+class test_utils(Case):
 
     def test_qualname(self):
         Class = type("Fox", (object, ), {"__module__": "quick.brown"})
@@ -127,7 +127,7 @@ class test_utils(unittest.TestCase):
         self.assertIs(x.__delete__(None), x)
 
 
-class test_mpromise(unittest.TestCase):
+class test_mpromise(Case):
 
     def test_is_memoized(self):
 

celery/tests/test_utils/test_datastructures.py

@@ -6,15 +6,14 @@ import sys
 from celery.datastructures import (ExceptionInfo, LRUCache, LimitedSet,
                                    AttributeDict, DictAttribute,
                                    ConfigurationView, DependencyGraph)
-from celery.tests.utils import unittest
-from celery.tests.utils import WhateverIO
+from celery.tests.utils import Case, WhateverIO
 
 
 class Object(object):
     pass
 
 
-class test_DictAttribute(unittest.TestCase):
+class test_DictAttribute(Case):
 
     def test_get_set(self):
         x = DictAttribute(Object())
@@ -48,7 +47,7 @@ class test_DictAttribute(unittest.TestCase):
                              dict(attr1=1, attr2=2))
 
 
-class test_ConfigurationView(unittest.TestCase):
+class test_ConfigurationView(Case):
 
     def setUp(self):
         self.view = ConfigurationView({"changed_key": 1,
@@ -91,7 +90,7 @@ class test_ConfigurationView(unittest.TestCase):
         self.assertItemsEqual(self.view.values(), expected.values())
 
 
-class test_ExceptionInfo(unittest.TestCase):
+class test_ExceptionInfo(Case):
 
     def test_exception_info(self):
 
@@ -111,7 +110,7 @@ class test_ExceptionInfo(unittest.TestCase):
         self.assertTrue(r)
 
 
-class test_LimitedSet(unittest.TestCase):
+class test_LimitedSet(Case):
 
     def test_add(self):
         s = LimitedSet(maxlen=2)
@@ -169,7 +168,7 @@ class test_LimitedSet(unittest.TestCase):
         self.assertIsInstance(s.as_dict(), dict)
 
 
-class test_LRUCache(unittest.TestCase):
+class test_LRUCache(Case):
 
     def test_expires(self):
         limit = 100
@@ -246,7 +245,7 @@ class test_LRUCache(unittest.TestCase):
         self.assertTrue(c.items())
 
 
-class test_AttributeDict(unittest.TestCase):
+class test_AttributeDict(Case):
 
     def test_getattr__setattr(self):
         x = AttributeDict({"foo": "bar"})
@@ -257,7 +256,7 @@ class test_AttributeDict(unittest.TestCase):
         self.assertEqual(x["bar"], "foo")
 
 
-class test_DependencyGraph(unittest.TestCase):
+class test_DependencyGraph(Case):
 
     def graph1(self):
         return DependencyGraph([

celery/tests/test_utils/test_pickle.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from celery.utils.serialization import pickle
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class RegularException(Exception):
@@ -15,7 +15,7 @@ class ArgOverrideException(Exception):
         Exception.__init__(self, message, status_code)
 
 
-class TestPickle(unittest.TestCase):
+class TestPickle(Case):
 
     def test_pickle_regular_exception(self):
         exc = None

celery/tests/test_utils/test_serialization.py

@@ -3,11 +3,10 @@ from __future__ import with_statement
 
 import sys
 
-from celery.tests.utils import unittest
-from celery.tests.utils import mask_modules
+from celery.tests.utils import Case, mask_modules
 
 
-class TestAAPickle(unittest.TestCase):
+class TestAAPickle(Case):
 
     def test_no_cpickle(self):
         prev = sys.modules.pop("celery.utils.serialization", None)

celery/tests/test_utils/test_utils_encoding.py

@@ -5,10 +5,10 @@ import sys
 from nose import SkipTest
 
 from celery.utils import encoding
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class test_encoding(unittest.TestCase):
+class test_encoding(Case):
 
     def test_safe_str(self):
         self.assertTrue(encoding.safe_str(object()))

celery/tests/test_utils/test_utils_info.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from celery import Celery
 from celery.utils import textindent
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 RANDTEXT = """\
 The quick brown
@@ -32,7 +32,7 @@ QUEUE_FORMAT1 = """. queue1:      exchange:exchange1 (type1) binding:bind1"""
 QUEUE_FORMAT2 = """. queue2:      exchange:exchange2 (type2) binding:bind2"""
 
 
-class TestInfo(unittest.TestCase):
+class TestInfo(Case):
 
     def test_textindent(self):
         self.assertEqual(textindent(RANDTEXT, 4), RANDTEXT_RES)

celery/tests/test_utils/test_utils_timeutils.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import
 from datetime import datetime, timedelta
 
 from celery.utils import timeutils
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class test_timeutils(unittest.TestCase):
+class test_timeutils(Case):
 
     def test_delta_resolution(self):
         D = timeutils.delta_resolution

celery/tests/test_worker/test_bootsteps.py

@@ -5,11 +5,10 @@ from mock import Mock
 
 from celery import abstract
 
-from celery.tests.utils import unittest
-from celery.tests.utils import AppCase
+from celery.tests.utils import AppCase, Case
 
 
-class test_Component(unittest.TestCase):
+class test_Component(Case):
 
     class Def(abstract.Component):
         name = "test_Component.Def"
@@ -72,7 +71,7 @@ class test_Component(unittest.TestCase):
         self.assertFalse(x.create.call_count)
 
 
-class test_StartStopComponent(unittest.TestCase):
+class test_StartStopComponent(Case):
 
     class Def(abstract.StartStopComponent):
         name = "test_StartStopComponent.Def"

celery/tests/test_worker/test_worker_autoscale.py

@@ -10,7 +10,7 @@ from mock import Mock, patch
 from celery.concurrency.base import BasePool
 from celery.worker import state
 from celery.worker import autoscale
-from celery.tests.utils import unittest, sleepdeprived
+from celery.tests.utils import Case, sleepdeprived
 
 logger = logging.getLogger("celery.tests.autoscale")
 
@@ -43,7 +43,7 @@ class MockPool(BasePool):
         return self._pool._processes
 
 
-class test_Autoscaler(unittest.TestCase):
+class test_Autoscaler(Case):
 
     def setUp(self):
         self.pool = MockPool(3)

celery/tests/test_worker/test_worker_control.py

@@ -22,7 +22,7 @@ from celery.worker import state
 from celery.worker.state import revoked
 from celery.worker import control
 from celery.worker.control import Panel
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 hostname = socket.gethostname()
 
@@ -57,7 +57,7 @@ class Consumer(object):
         return {"xyz": "XYZ"}
 
 
-class test_ControlPanel(unittest.TestCase):
+class test_ControlPanel(Case):
 
     def setUp(self):
         self.app = current_app

celery/tests/test_worker/test_worker_heartbeat.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from celery.worker.heartbeat import Heart
-from celery.tests.utils import unittest, sleepdeprived
+from celery.tests.utils import Case, sleepdeprived
 
 
 class MockDispatcher(object):
@@ -45,7 +45,7 @@ class MockTimer(object):
         entry.cancel()
 
 
-class TestHeart(unittest.TestCase):
+class TestHeart(Case):
 
     def test_stop(self):
         timer = MockTimer()

celery/tests/test_worker/test_worker_mediator.py

@@ -9,7 +9,7 @@ from mock import Mock, patch
 from celery.utils import uuid
 from celery.worker.mediator import Mediator
 from celery.worker.state import revoked as revoked_tasks
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
 class MockTask(object):
@@ -29,7 +29,7 @@ class MockTask(object):
         return False
 
 
-class test_Mediator(unittest.TestCase):
+class test_Mediator(Case):
 
     def test_mediator_start__stop(self):
         ready_queue = Queue()

celery/tests/test_worker/test_worker_revoke.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import
 
 from celery.worker import state
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class test_revoked(unittest.TestCase):
+class test_revoked(Case):
 
     def test_is_working(self):
         state.revoked.add("foo")

celery/tests/test_worker/test_worker_state.py

@@ -2,10 +2,10 @@ from __future__ import absolute_import
 
 from celery.datastructures import LimitedSet
 from celery.worker import state
-from celery.tests.utils import unittest
+from celery.tests.utils import Case
 
 
-class StateResetCase(unittest.TestCase):
+class StateResetCase(Case):
 
     def setUp(self):
         self.reset_state()