testproj renamed to tests, and celery/tests moved to tests/testunits (and so

tests are no longer installed into site packages)

setup.py

@@ -100,7 +100,7 @@ setup(
     url=distmeta.__homepage__,
     platforms=["any"],
     license="BSD",
-    packages=find_packages(exclude=['ez_setup', 'testproj', 'testproj.*']),
+    packages=find_packages(exclude=['ez_setup', 'tests', 'tests.*']),
     scripts=["bin/celeryd", "bin/celeryinit", "bin/celerybeat"],
     zip_safe=False,
     install_requires=install_requires,

testproj/settings.py → tests/settings.py

@@ -33,7 +33,7 @@ COVERAGE_EXCLUDE_MODULES = ("celery.__init__",
                             "celery.backends.tyrant", # FIXME
 )
 
-NOSE_ARGS = [os.path.join(here, os.pardir, "celery", "tests"),
+NOSE_ARGS = [here,
             "--cover3-package=celery",
             "--cover3-branch",
             "--cover3-exclude=%s" % ",".join(COVERAGE_EXCLUDE_MODULES)]

celery/tests/test_backends/test_redis.py → tests/testunits/test_backends/test_redis.py

@@ -7,10 +7,11 @@ from django.core.exceptions import ImproperlyConfigured
 
 from celery import states
 from celery.utils import gen_unique_id
-from celery.tests.utils import execute_context
 from celery.backends import pyredis
 from celery.backends.pyredis import RedisBackend
 
+from testunits.utils import execute_context, mask_modules
+
 _no_redis_msg = "* Redis %s. Will not execute related tests."
 _no_redis_msg_emitted = False
 
@@ -135,7 +136,6 @@ class TestRedisBackend(unittest.TestCase):
 class TestTyrantBackendNoTyrant(unittest.TestCase):
 
     def test_tyrant_None_if_tyrant_not_installed(self):
-        from celery.tests.utils import mask_modules
         prev = sys.modules.pop("celery.backends.pyredis")
         try:
             def with_redis_masked(_val):

celery/tests/test_buckets.py → tests/testunits/test_buckets.py

@@ -10,10 +10,11 @@ from billiard.utils.functional import curry
 
 from celery.task.base import Task
 from celery.utils import gen_unique_id
-from celery.tests.utils import skip_if_environ
 from celery.worker import buckets
 from celery.registry import TaskRegistry
 
+from testunits.utils import skip_if_environ
+
 skip_if_disabled = curry(skip_if_environ("SKIP_RLIMITS"))
 
 

celery/tests/test_loaders.py → tests/testunits/test_loaders.py

@@ -8,7 +8,8 @@ from celery import loaders
 from celery.loaders import base
 from celery.loaders import djangoapp
 from celery.loaders import default
-from celery.tests.utils import with_environ
+
+from testunits.utils import with_environ
 
 
 class TestLoaders(unittest.TestCase):

celery/tests/test_log.py → tests/testunits/test_log.py

@@ -10,13 +10,13 @@ from StringIO import StringIO
 try:
     from contextlib import contextmanager
 except ImportError:
-    from celery.tests.utils import fallback_contextmanager as contextmanager
+    from testunits.utils import fallback_contextmanager as contextmanager
 
 from carrot.utils import rpartition
 
 from celery.log import (setup_logger, emergency_error,
                         redirect_stdouts_to_logger, LoggingProxy)
-from celery.tests.utils import override_stdouts, execute_context
+from testunits.utils import override_stdouts, execute_context
 
 
 @contextmanager

celery/tests/test_result.py → tests/testunits/test_result.py

@@ -1,14 +1,16 @@
 from __future__ import generators
+
 import unittest
 
 from celery import states
 from celery.utils import gen_unique_id
-from celery.tests.utils import skip_if_quick
 from celery.result import AsyncResult, TaskSetResult
 from celery.backends import default_backend
 from celery.exceptions import TimeoutError
 from celery.task.base import Task
 
+from testunits.utils import skip_if_quick
+
 
 def mock_task(name, status, result):
     return dict(id=gen_unique_id(), name=name, status=status, result=result)

celery/tests/test_serialization.py → tests/testunits/test_serialization.py

@@ -1,13 +1,12 @@
 import sys
 import unittest
 
-from celery.tests.utils import execute_context
+from testunits.utils import execute_context, mask_modules
 
 
 class TestAAPickle(unittest.TestCase):
 
     def test_no_cpickle(self):
-        from celery.tests.utils import mask_modules
         prev = sys.modules.pop("billiard.serialization")
         try:
             def with_cPickle_masked(_val):

celery/tests/test_task.py → tests/testunits/test_task.py

@@ -264,7 +264,7 @@ class TestCeleryTasks(unittest.TestCase):
 
         # task name generated out of class module + name.
         T2 = self.createTaskCls("T2")
-        self.assertEquals(T2().name, "celery.tests.test_task.T2")
+        self.assertTrue(T2().name.endswith("test_task.T2"))
 
         t1 = T1()
         consumer = t1.get_consumer()

celery/tests/test_task_http.py → tests/testunits/test_task_http.py

@@ -8,7 +8,7 @@ from urllib import addinfourl
 try:
     from contextlib import contextmanager
 except ImportError:
-    from celery.tests.utils import fallback_contextmanager as contextmanager
+    from testunits.utils import fallback_contextmanager as contextmanager
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -18,7 +18,8 @@ from billiard.utils.functional import wraps
 from anyjson import serialize
 
 from celery.task import http
-from celery.tests.utils import eager_tasks, execute_context
+
+from testunits.utils import eager_tasks, execute_context
 
 
 @contextmanager

celery/tests/test_utils.py → tests/testunits/test_utils.py

@@ -5,8 +5,9 @@ import unittest
 from billiard.utils.functional import wraps
 
 from celery import utils
-from celery.tests.utils import sleepdeprived, execute_context
 
+from testunits.utils import sleepdeprived, execute_context
+from testunits.utils import mask_modules
 
 class TestChunks(unittest.TestCase):
 
@@ -31,7 +32,6 @@ class TestChunks(unittest.TestCase):
 class TestGenUniqueId(unittest.TestCase):
 
     def test_gen_unique_id_without_ctypes(self):
-        from celery.tests.utils import mask_modules
         old_utils = sys.modules.pop("celery.utils")
 
         def with_ctypes_masked(_val):

celery/tests/test_worker.py → tests/testunits/test_worker.py

@@ -9,8 +9,6 @@ from billiard.serialization import pickle
 
 from celery import conf
 from celery.utils import gen_unique_id, noop
-from celery.tests.utils import execute_context
-from celery.tests.compat import catch_warnings
 from celery.worker import WorkController
 from celery.worker.listener import CarrotListener, RUN, CLOSE
 from celery.worker.job import TaskWrapper
@@ -18,6 +16,9 @@ from celery.worker.scheduler import Scheduler
 from celery.decorators import task as task_dec
 from celery.decorators import periodic_task as periodic_task_dec
 
+from testunits.utils import execute_context
+from testunits.compat import catch_warnings
+
 
 class PlaceHolder(object):
         pass

celery/tests/test_worker_job.py → tests/testunits/test_worker_job.py

@@ -12,8 +12,6 @@ from celery import states
 from celery.log import setup_logger
 from celery.task.base import Task
 from celery.utils import gen_unique_id
-from celery.tests.utils import execute_context
-from celery.tests.compat import catch_warnings
 from celery.models import TaskMeta
 from celery.result import AsyncResult
 from celery.worker.job import WorkerTaskTrace, TaskWrapper
@@ -22,6 +20,9 @@ from celery.exceptions import RetryTaskError, NotRegistered
 from celery.decorators import task as task_dec
 from celery.datastructures import ExceptionInfo
 
+from testunits.utils import execute_context
+from testunits.compat import catch_warnings
+
 scratch = {"ACK": False}
 some_kwargs_scratchpad = {}