Use lowercase test_ for concrete test cases

celery/tests/test_app/test_app_amqp.py

@@ -7,7 +7,7 @@ from celery.app.amqp import MSG_OPTIONS, extract_msg_options
 from celery.tests.utils import AppCase
 
 
-class TestMsgOptions(AppCase):
+class test_extract_message_options(AppCase):
 
     def test_MSG_OPTIONS(self):
         self.assertTrue(MSG_OPTIONS)

celery/tests/test_app/test_celery.py

@@ -4,7 +4,7 @@ from celery.tests.utils import Case
 import celery
 
 
-class TestInitFile(Case):
+class test_celery_package(Case):
 
     def test_version(self):
         self.assertTrue(celery.VERSION)

celery/tests/test_app/test_loaders.py

@@ -44,7 +44,7 @@ class DummyLoader(base.BaseLoader):
         return {"foo": "bar", "CELERY_IMPORTS": ("os", "sys")}
 
 
-class TestLoaders(AppCase):
+class test_loaders(AppCase):
 
     def test_get_loader_cls(self):
 
@@ -62,7 +62,7 @@ class TestLoaders(AppCase):
             self.assertIs(loaders.load_settings(), self.app.conf)
 
 
-class TestLoaderBase(Case):
+class test_LoaderBase(Case):
     message_options = {"subject": "Subject",
                        "body": "Body",
                        "sender": "x@x.com",
@@ -135,7 +135,7 @@ class TestLoaderBase(Case):
             self.loader.cmdline_config_parser(["broker.port=foobar"])
 
 
-class TestDefaultLoader(Case):
+class test_DefaultLoader(Case):
 
     def test_wanted_module_item(self):
         l = default.Loader()

celery/tests/test_backends/__init__.py

@@ -8,7 +8,7 @@ from celery.backends.cache import CacheBackend
 from celery.tests.utils import Case
 
 
-class TestBackends(Case):
+class test_backends(Case):
 
     def test_get_backend_aliases(self):
         expects = [("amqp", AMQPBackend),

celery/tests/test_backends/test_mongodb.py

@@ -27,7 +27,7 @@ MONGODB_DATABASE = "testing"
 MONGODB_COLLECTION = "collection1"
 
 
-class TestBackendMongoDb(Case):
+class test_MongoBackend(Case):
 
     def setUp(self):
         if pymongo is None:

celery/tests/test_backends/test_redis.py

@@ -56,7 +56,7 @@ def get_redis_or_SkipTest():
         return emit_no_redis_msg("not configured")
 
 
-class TestRedisBackend(Case):
+class test_RedisBackend(Case):
 
     def test_mark_as_done(self):
         tb = get_redis_or_SkipTest()
@@ -94,7 +94,7 @@ class TestRedisBackend(Case):
         self.assertIsInstance(tb.get_result(tid3), KeyError)
 
 
-class TestRedisBackendNoRedis(Case):
+class test_RedisBackend_without_redis(Case):
 
     def test_redis_None_if_redis_not_installed(self):
         prev = sys.modules.pop("celery.backends.redis")

celery/tests/test_concurrency/test_concurrency_gevent.py

@@ -1,53 +0,0 @@
-from __future__ import absolute_import
-
-from nose import SkipTest
-
-from celery.concurrency.gevent import TaskPool
-from celery.tests.utils import unittest
-
-
-class GeventCase(unittest.TestCase):
-
-    def setUp(self):
-        try:
-            self.gevent = __import__("gevent")
-        except ImportError:
-            raise SkipTest(
-                "gevent not installed, skipping related tests.")
-
-
-class test_TaskPool(GeventCase):
-
-    def test_grow(self):
-        pool = TaskPool(10)
-        pool.start()
-        self.assertEqual(pool._pool.size, 10)
-        pool.grow()
-        self.assertEqual(pool._pool.size, 11)
-
-    def test_grow_many(self):
-        pool = TaskPool(10)
-        pool.start()
-        self.assertEqual(pool._pool.size, 10)
-        pool.grow(2)
-        self.assertEqual(pool._pool.size, 12)
-
-    def test_shrink(self):
-        pool = TaskPool(10)
-        pool.start()
-        self.assertEqual(pool._pool.size, 10)
-        pool.shrink()
-        self.assertEqual(pool._pool.size, 9)
-
-    def test_shrink_many(self):
-        pool = TaskPool(10)
-        pool.start()
-        self.assertEqual(pool._pool.size, 10)
-        pool.shrink(2)
-        self.assertEqual(pool._pool.size, 8)
-
-    def test_num_processes(self):
-        pool = TaskPool(10)
-        pool.start()
-        pool.apply_async(lambda x: x, (2, ), {})
-        self.assertEqual(pool.num_processes, 1)

celery/tests/test_concurrency/test_gevent.py

@@ -14,6 +14,13 @@ from celery.concurrency.gevent import (
 )
 
 from celery.tests.utils import Case, mock_module
+gevent_modules = (
+    "gevent",
+    "gevent.monkey",
+    "gevent.greenlet",
+    "gevent.pool",
+    "greenlet",
+)
 
 
 class GeventCase(Case):
@@ -31,38 +38,32 @@ class GeventCase(Case):
 class test_gevent_patch(GeventCase):
 
     def test_is_patched(self):
-        monkey_patched = []
-        from gevent import monkey
-        prev_monkey_patch = monkey.patch_all
-        monkey.patch_all = lambda: monkey_patched.append(True)
-        prev_gevent = sys.modules.pop("celery.concurrency.gevent", None)
-        os.environ.pop("GEVENT_NOPATCH")
-        try:
-            import celery.concurrency.gevent  # noqa
-            self.assertTrue(monkey_patched)
-        finally:
-            sys.modules["celery.concurrency.gevent"] = prev_gevent
-            os.environ["GEVENT_NOPATCH"] = "yes"
-            monkey.patch_all = prev_monkey_patch
-
-
-gevent_modules = (
-    "gevent",
-    "gevent.monkey",
-    "gevent.greenlet",
-    "gevent.pool",
-    "greenlet",
-)
+        with mock_module(*gevent_modules):
+            monkey_patched = []
+            from gevent import monkey
+            prev_monkey_patch = monkey.patch_all
+            monkey.patch_all = lambda: monkey_patched.append(True)
+            prev_gevent = sys.modules.pop("celery.concurrency.gevent", None)
+            os.environ.pop("GEVENT_NOPATCH")
+            try:
+                import celery.concurrency.gevent  # noqa
+                self.assertTrue(monkey_patched)
+            finally:
+                sys.modules["celery.concurrency.gevent"] = prev_gevent
+                os.environ["GEVENT_NOPATCH"] = "yes"
+                monkey.patch_all = prev_monkey_patch
 
 
 class test_Schedule(Case):
 
     def test_sched(self):
         with mock_module(*gevent_modules):
-            @patch("gevent.greenlet.Greenlet")
+            @patch("gevent.greenlet")
             @patch("gevent.greenlet.GreenletExit")
-            def do_test(Greenlet, GreenletExit):
+            def do_test(GreenletExit, greenlet):
+                greenlet.Greenlet = object
                 x = Schedule()
+                greenlet.Greenlet = Mock()
                 x._Greenlet.spawn_later = Mock()
                 x._GreenletExit = KeyError
                 entry = Mock()

celery/tests/test_concurrency/test_pool.py

@@ -25,7 +25,7 @@ def raise_something(i):
         return ExceptionInfo(sys.exc_info())
 
 
-class TestTaskPool(Case):
+class test_TaskPool(Case):
 
     def setUp(self):
         try:

celery/tests/test_events/__init__.py

@@ -29,7 +29,7 @@ class MockProducer(object):
         return False
 
 
-class TestEvent(Case):
+class test_Event(Case):
 
     def test_constructor(self):
         event = events.Event("world war II")
@@ -37,7 +37,7 @@ class TestEvent(Case):
         self.assertTrue(event["timestamp"])
 
 
-class TestEventDispatcher(Case):
+class test_EventDispatcher(Case):
 
     def setUp(self):
         self.app = app_or_default()
@@ -99,7 +99,7 @@ class TestEventDispatcher(Case):
             connection.close()
 
 
-class TestEventReceiver(Case):
+class test_EventReceiver(Case):
 
     def setUp(self):
         self.app = app_or_default()

celery/tests/test_events/test_events_cursesmon.py

@@ -11,7 +11,7 @@ class MockWindow(object):
         return self.y, self.x
 
 
-class TestCursesDisplay(Case):
+class test_CursesDisplay(Case):
 
     def setUp(self):
         try:

celery/tests/test_task/__init__.py

@@ -106,7 +106,7 @@ def retry_task_customexc(arg1, arg2, kwarg=1, **kwargs):
             return current.retry(countdown=0, exc=exc)
 
 
-class TestTaskRetries(Case):
+class test_task_retries(Case):
 
     def test_retry(self):
         retry_task.__class__.max_retries = 3
@@ -182,7 +182,7 @@ class TestTaskRetries(Case):
         self.assertEqual(retry_task.iterations, 2)
 
 
-class TestCeleryTasks(Case):
+class test_tasks(Case):
 
     def test_unpickle_task(self):
         import pickle
@@ -383,7 +383,7 @@ class TestCeleryTasks(Case):
         self.assertTrue(logger)
 
 
-class TestTaskSet(Case):
+class test_TaskSet(Case):
 
     @with_eager_tasks
     def test_function_taskset(self):
@@ -430,7 +430,7 @@ class TestTaskSet(Case):
         self.assertTrue(res.taskset_id.startswith(prefix))
 
 
-class TestTaskApply(Case):
+class test_apply_task(Case):
 
     def test_apply_throw(self):
         with self.assertRaises(KeyError):
@@ -474,7 +474,7 @@ def my_periodic():
     pass
 
 
-class TestPeriodicTask(Case):
+class test_periodic_tasks(Case):
 
     def test_must_have_run_every(self):
         with self.assertRaises(NotImplementedError):

celery/tests/test_task/test_context.py

@@ -37,7 +37,7 @@ class ContextManipulator(threading.Thread):
         self.result = get_context_as_dict(self.ctx)
 
 
-class TestTaskContext(Case):
+class test_Context(Case):
 
     def test_default_context(self):
         # A bit of a tautological test, since it uses the same

celery/tests/test_task/test_registry.py

@@ -6,14 +6,14 @@ from celery.task import Task, PeriodicTask
 from celery.tests.utils import Case
 
 
-class TestTask(Task):
+class MockTask(Task):
     name = "celery.unittest.test_task"
 
     def run(self, **kwargs):
         return True
 
 
-class TestPeriodicTask(PeriodicTask):
+class MockPeriodicTask(PeriodicTask):
     name = "celery.unittest.test_periodic_task"
     run_every = 10
 
@@ -21,7 +21,7 @@ class TestPeriodicTask(PeriodicTask):
         return True
 
 
-class TestTaskRegistry(Case):
+class test_TaskRegistry(Case):
 
     def assertRegisterUnregisterCls(self, r, task):
         with self.assertRaises(r.NotRegistered):
@@ -40,27 +40,27 @@ class TestTaskRegistry(Case):
         self.assertIsInstance(r, dict,
                 "TaskRegistry is mapping")
 
-        self.assertRegisterUnregisterCls(r, TestTask)
-        self.assertRegisterUnregisterCls(r, TestPeriodicTask)
+        self.assertRegisterUnregisterCls(r, MockTask)
+        self.assertRegisterUnregisterCls(r, MockPeriodicTask)
 
-        r.register(TestPeriodicTask)
-        r.unregister(TestPeriodicTask.name)
-        self.assertNotIn(TestPeriodicTask, r)
-        r.register(TestPeriodicTask)
+        r.register(MockPeriodicTask)
+        r.unregister(MockPeriodicTask.name)
+        self.assertNotIn(MockPeriodicTask, r)
+        r.register(MockPeriodicTask)
 
         tasks = dict(r)
-        self.assertIsInstance(tasks.get(TestTask.name), TestTask)
-        self.assertIsInstance(tasks.get(TestPeriodicTask.name),
-                                   TestPeriodicTask)
+        self.assertIsInstance(tasks.get(MockTask.name), MockTask)
+        self.assertIsInstance(tasks.get(MockPeriodicTask.name),
+                                   MockPeriodicTask)
 
-        self.assertIsInstance(r[TestTask.name], TestTask)
-        self.assertIsInstance(r[TestPeriodicTask.name],
-                                   TestPeriodicTask)
+        self.assertIsInstance(r[MockTask.name], MockTask)
+        self.assertIsInstance(r[MockPeriodicTask.name],
+                                   MockPeriodicTask)
 
-        r.unregister(TestTask)
-        self.assertNotIn(TestTask.name, r)
-        r.unregister(TestPeriodicTask)
-        self.assertNotIn(TestPeriodicTask.name, r)
+        r.unregister(MockTask)
+        self.assertNotIn(MockTask.name, r)
+        r.unregister(MockPeriodicTask)
+        self.assertNotIn(MockPeriodicTask.name, r)
 
-        self.assertTrue(TestTask().run())
-        self.assertTrue(TestPeriodicTask().run())
+        self.assertTrue(MockTask().run())
+        self.assertTrue(MockPeriodicTask().run())

celery/tests/test_task/test_result.py

@@ -42,7 +42,7 @@ def make_mock_taskset(size=10):
     return [AsyncResult(task["id"]) for task in tasks]
 
 
-class TestAsyncResult(AppCase):
+class test_AsyncResult(AppCase):
 
     def setup(self):
         self.task1 = mock_task("task1", states.SUCCESS, "the")
@@ -221,7 +221,7 @@ class SimpleBackend(object):
             return ((id, {"result": i}) for i, id in enumerate(self.ids))
 
 
-class TestTaskSetResult(AppCase):
+class test_TaskSetResult(AppCase):
 
     def setup(self):
         self.size = 10
@@ -341,7 +341,7 @@ class TestTaskSetResult(AppCase):
         self.assertEqual(self.ts.completed_count(), len(self.ts))
 
 
-class TestPendingAsyncResult(AppCase):
+class test_pending_AsyncResult(AppCase):
 
     def setup(self):
         self.task = AsyncResult(uuid())
@@ -350,7 +350,7 @@ class TestPendingAsyncResult(AppCase):
         self.assertIsNone(self.task.result)
 
 
-class TestFailedTaskSetResult(TestTaskSetResult):
+class test_failed_AsyncResult(TestTaskSetResult):
 
     def setup(self):
         self.size = 11
@@ -394,7 +394,7 @@ class TestFailedTaskSetResult(TestTaskSetResult):
         self.assertTrue(self.ts.failed())
 
 
-class TestTaskSetPending(AppCase):
+class test_pending_TaskSet(AppCase):
 
     def setup(self):
         self.ts = TaskSetResult(uuid(), [
@@ -426,7 +426,7 @@ class RaisingTask(Task):
         raise KeyError("xy")
 
 
-class TestEagerResult(AppCase):
+class test_EagerResult(AppCase):
 
     def test_wait_raises(self):
         res = RaisingTask.apply(args=[3, 3])

celery/tests/test_task/test_task_abortable.py

@@ -10,7 +10,7 @@ class MyAbortableTask(AbortableTask):
         return True
 
 
-class TestAbortableTask(Case):
+class test_AbortableTask(Case):
 
     def test_async_result_is_abortable(self):
         t = MyAbortableTask()

celery/tests/test_task/test_task_http.py

@@ -53,7 +53,7 @@ def unknown_response():
     return _response(dumps({"status": "u.u.u.u", "retval": True}))
 
 
-class TestEncodings(Case):
+class test_encodings(Case):
 
     def test_utf8dict(self):
         uk = "foobar"
@@ -65,7 +65,7 @@ class TestEncodings(Case):
             self.assertIsInstance(value, str)
 
 
-class TestMutableURL(Case):
+class test_MutableURL(Case):
 
     def test_url_query(self):
         url = http.MutableURL("http://example.com?x=10&y=20&z=Foo")
@@ -97,7 +97,7 @@ class TestMutableURL(Case):
         self.assertEqual(url.query, {"zzz": "xxx"})
 
 
-class TestHttpDispatch(Case):
+class test_HttpDispatch(Case):
 
     def test_dispatch_success(self):
         logger = logging.getLogger("celery.unittest")
@@ -152,7 +152,7 @@ class TestHttpDispatch(Case):
             self.assertEqual(d.dispatch(), 100)
 
 
-class TestURL(Case):
+class test_URL(Case):
 
     def test_URL_get_async(self):
         with eager_tasks():

celery/tests/test_utils/test_pickle.py

@@ -15,7 +15,7 @@ class ArgOverrideException(Exception):
         Exception.__init__(self, message, status_code)
 
 
-class TestPickle(Case):
+class test_Pickle(Case):
 
     def test_pickle_regular_exception(self):
         exc = None

celery/tests/test_utils/test_serialization.py

@@ -6,7 +6,7 @@ import sys
 from celery.tests.utils import Case, mask_modules
 
 
-class TestAAPickle(Case):
+class test_AAPickle(Case):
 
     def test_no_cpickle(self):
         prev = sys.modules.pop("celery.utils.serialization", None)

celery/tests/test_utils/test_utils_info.py

@@ -32,7 +32,7 @@ QUEUE_FORMAT1 = """. queue1:      exchange:exchange1 (type1) binding:bind1"""
 QUEUE_FORMAT2 = """. queue2:      exchange:exchange2 (type2) binding:bind2"""
 
 
-class TestInfo(Case):
+class test_Info(Case):
 
     def test_textindent(self):
         self.assertEqual(indent(RANDTEXT, 4), RANDTEXT_RES)

celery/tests/test_worker/test_worker_heartbeat.py

@@ -45,7 +45,7 @@ class MockTimer(object):
         entry.cancel()
 
 
-class TestHeart(Case):
+class test_Heart(Case):
 
     def test_stop(self):
         timer = MockTimer()