Renames celery.tests.utils to celery.tests.case and celery.tests.utilities/ celery.tests.utils

celery/tests/app/test_amqp.py

@@ -4,7 +4,7 @@ from kombu import Exchange, Queue
 from mock import Mock
 
 from celery.app.amqp import Queues, TaskPublisher
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 
 class test_TaskProducer(AppCase):

celery/tests/app/test_annotations.py

@@ -4,7 +4,7 @@ from celery.app.annotations import MapAnnotation, prepare
 from celery.task import task
 from celery.utils.imports import qualname
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 @task()

celery/tests/app/test_app.py

@@ -19,7 +19,7 @@ from celery.platforms import pyimplementation
 from celery.utils.serialization import pickle
 
 from celery.tests import config
-from celery.tests.utils import (
+from celery.tests.case import (
     Case,
     mask_modules,
     platform_pyimp,

celery/tests/app/test_beat.py

@@ -13,7 +13,7 @@ from celery.five import keys, string_t
 from celery.result import AsyncResult
 from celery.schedules import schedule
 from celery.utils import uuid
-from celery.tests.utils import AppCase, patch_settings
+from celery.tests.case import AppCase, patch_settings
 
 
 class Object(object):

celery/tests/app/test_builtins.py

@@ -7,7 +7,7 @@ from celery.app import builtins
 from celery.canvas import Signature
 from celery.five import range
 from celery._state import _task_stack
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 
 @shared_task()

celery/tests/app/test_celery.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 import celery
 

celery/tests/app/test_control.py

@@ -9,7 +9,7 @@ from kombu.pidbox import Mailbox
 from celery.app import control
 from celery.task import task
 from celery.utils import uuid
-from celery.tests.utils import AppCase, Case
+from celery.tests.case import AppCase, Case
 
 
 @task()

celery/tests/app/test_defaults.py

@@ -7,7 +7,7 @@ from mock import Mock, patch
 
 from celery.app.defaults import NAMESPACES
 
-from celery.tests.utils import Case, pypy_version, sys_platform
+from celery.tests.case import Case, pypy_version, sys_platform
 
 
 class test_defaults(Case):

celery/tests/app/test_loaders.py

@@ -17,7 +17,7 @@ from celery.loaders.app import AppLoader
 from celery.utils.imports import NotAPackage
 from celery.utils.mail import SendmailWarning
 
-from celery.tests.utils import AppCase, Case
+from celery.tests.case import AppCase, Case
 
 
 class DummyLoader(base.BaseLoader):

celery/tests/app/test_log.py

@@ -17,7 +17,7 @@ from celery.utils.log import (
     logger as base_logger,
     get_task_logger,
 )
-from celery.tests.utils import (
+from celery.tests.case import (
     AppCase, Case, override_stdouts, wrap_logger, get_handlers,
 )
 

celery/tests/app/test_routes.py

@@ -8,7 +8,7 @@ from kombu.utils.functional import maybe_promise
 from celery.app import routes
 from celery.exceptions import QueueNotFound
 from celery.task import task
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 
 def Router(app, *args, **kwargs):

celery/tests/app/test_utils.py

@@ -5,7 +5,7 @@ from collections import Mapping, MutableMapping
 from celery import Celery
 from celery.app.utils import Settings, bugreport
 
-from celery.tests.utils import AppCase, Case, Mock
+from celery.tests.case import AppCase, Case, Mock
 
 
 class TestSettings(Case):

celery/tests/backends/test_amqp.py

@@ -18,7 +18,7 @@ from celery.exceptions import TimeoutError
 from celery.five import Empty, Queue, range
 from celery.utils import uuid
 
-from celery.tests.utils import AppCase, sleepdeprived, Mock
+from celery.tests.case import AppCase, sleepdeprived, Mock
 
 
 class SomeClass(object):

celery/tests/backends/test_backends.py

@@ -6,7 +6,7 @@ from celery import current_app
 from celery import backends
 from celery.backends.amqp import AMQPBackend
 from celery.backends.cache import CacheBackend
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_backends(Case):

celery/tests/backends/test_base.py

@@ -25,7 +25,7 @@ from celery.backends.base import (
 )
 from celery.utils import uuid
 
-from celery.tests.utils import AppCase, Case
+from celery.tests.case import AppCase, Case
 
 
 class wrapobject(object):

celery/tests/backends/test_cache.py

@@ -17,7 +17,7 @@ from celery.result import AsyncResult
 from celery.task import subtask
 from celery.utils import uuid
 
-from celery.tests.utils import AppCase, mask_modules, reset_modules
+from celery.tests.case import AppCase, mask_modules, reset_modules
 
 
 class SomeClass(object):

celery/tests/backends/test_cassandra.py

@@ -8,7 +8,7 @@ from pickle import loads, dumps
 from celery import Celery
 from celery import states
 from celery.exceptions import ImproperlyConfigured
-from celery.tests.utils import AppCase, mock_module
+from celery.tests.case import AppCase, mock_module
 
 
 class Object(object):

celery/tests/backends/test_database.py

@@ -11,7 +11,7 @@ from celery.exceptions import ImproperlyConfigured
 from celery.result import AsyncResult
 from celery.utils import uuid
 
-from celery.tests.utils import (
+from celery.tests.case import (
     Case,
     mask_modules,
     skip_if_pypy,

celery/tests/backends/test_mongodb.py

@@ -12,7 +12,7 @@ from celery import states
 from celery.backends import mongodb as module
 from celery.backends.mongodb import MongoBackend, Bunch, pymongo
 from celery.exceptions import ImproperlyConfigured
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 COLLECTION = 'taskmeta_celery'
 TASK_ID = str(uuid.uuid1())

celery/tests/backends/test_redis.py

@@ -16,7 +16,7 @@ from celery.result import AsyncResult
 from celery.task import subtask
 from celery.utils.timeutils import timedelta_seconds
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class Redis(object):

celery/tests/backends/test_rpc.py

@@ -5,7 +5,7 @@ from mock import patch
 from celery.backends.rpc import RPCBackend
 from celery._state import _task_stack
 
-from celery.tests.utils import AppCase, Mock
+from celery.tests.case import AppCase, Mock
 
 
 class test_RPCBackend(AppCase):

celery/tests/bin/test_amqp.py

@@ -11,7 +11,7 @@ from celery.bin.amqp import (
     main,
 )
 
-from celery.tests.utils import AppCase, WhateverIO
+from celery.tests.case import AppCase, WhateverIO
 
 
 class test_AMQShell(AppCase):

celery/tests/bin/test_base.py

@@ -10,7 +10,7 @@ from celery.bin.base import (
     Extensions,
     HelpFormatter,
 )
-from celery.tests.utils import AppCase, Case, override_stdouts
+from celery.tests.case import AppCase, Case, override_stdouts
 
 
 class Object(object):

celery/tests/bin/test_beat.py

@@ -14,7 +14,7 @@ from celery.app import app_or_default
 from celery.bin import beat as beat_bin
 from celery.apps import beat as beatapp
 
-from celery.tests.utils import AppCase, Mock
+from celery.tests.case import AppCase, Mock
 
 
 class MockedShelveModule(object):

celery/tests/bin/test_celery.py

@@ -27,7 +27,7 @@ from celery.bin.celery import (
     main as mainfun,
 )
 
-from celery.tests.utils import AppCase, Case, WhateverIO, override_stdouts
+from celery.tests.case import AppCase, Case, WhateverIO, override_stdouts
 
 
 @task()

celery/tests/bin/test_celeryd_detach.py

@@ -9,7 +9,7 @@ from celery.bin.celeryd_detach import (
     main,
 )
 
-from celery.tests.utils import Case, override_stdouts
+from celery.tests.case import Case, override_stdouts
 
 
 if not current_app.IS_WINDOWS:

celery/tests/bin/test_celeryevdump.py

@@ -9,7 +9,7 @@ from celery.events.dumper import (
     evdump,
 )
 
-from celery.tests.utils import Case, WhateverIO
+from celery.tests.case import Case, WhateverIO
 
 
 class test_Dumper(Case):

celery/tests/bin/test_events.py

@@ -6,7 +6,7 @@ from mock import patch as mpatch
 from celery.app import app_or_default
 from celery.bin import events
 
-from celery.tests.utils import Case, patch
+from celery.tests.case import Case, patch
 
 
 class MockCommand(object):

celery/tests/bin/test_multi.py

@@ -19,7 +19,7 @@ from celery.bin.multi import (
     __doc__ as doc,
 )
 
-from celery.tests.utils import Case, WhateverIO
+from celery.tests.case import Case, WhateverIO
 
 
 class test_functions(Case):

celery/tests/bin/test_worker.py

@@ -23,7 +23,7 @@ from celery.task import trace
 from celery.utils.log import ensure_process_aware_logger
 from celery.worker import state
 
-from celery.tests.utils import (
+from celery.tests.case import (
     AppCase,
     WhateverIO,
     skip_if_pypy,

celery/tests/compat_modules/test_decorators.py

@@ -4,7 +4,7 @@ import warnings
 
 from celery.task import base
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 def add(x, y):

celery/tests/compat_modules/test_messaging.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from celery import messaging
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_compat_messaging_module(Case):

celery/tests/compat_modules/test_sets.py

@@ -9,7 +9,7 @@ from celery.task import Task
 from celery.task.sets import subtask, TaskSet
 from celery.canvas import Signature
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class MockTask(Task):

celery/tests/concurrency/test_concurrency.py

@@ -6,7 +6,7 @@ from itertools import count
 from mock import Mock
 
 from celery.concurrency.base import apply_target, BasePool
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_BasePool(Case):

celery/tests/concurrency/test_eventlet.py

@@ -14,7 +14,7 @@ from celery.concurrency.eventlet import (
     TaskPool,
 )
 
-from celery.tests.utils import Case, mock_module, patch_many, skip_if_pypy
+from celery.tests.case import Case, mock_module, patch_many, skip_if_pypy
 
 
 class EventletCase(Case):

celery/tests/concurrency/test_gevent.py

@@ -12,7 +12,7 @@ from celery.concurrency.gevent import (
     TaskPool,
 )
 
-from celery.tests.utils import Case, mock_module, patch_many, skip_if_pypy
+from celery.tests.case import Case, mock_module, patch_many, skip_if_pypy
 gevent_modules = (
     'gevent',
     'gevent.monkey',

celery/tests/concurrency/test_pool.py

@@ -6,7 +6,7 @@ import itertools
 from nose import SkipTest
 
 from celery.datastructures import ExceptionInfo
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 def do_something(i):

celery/tests/concurrency/test_processes.py

@@ -11,7 +11,7 @@ from nose import SkipTest
 
 from celery.five import items, range
 from celery.utils.functional import noop
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 try:
     from celery.concurrency import processes as mp
 except ImportError:

celery/tests/concurrency/test_solo.py

@@ -4,7 +4,7 @@ import operator
 
 from celery.concurrency import solo
 from celery.utils.functional import noop
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_solo_TaskPool(Case):

celery/tests/concurrency/test_threads.py

@@ -4,7 +4,7 @@ from mock import Mock
 
 from celery.concurrency.threads import NullDict, TaskPool, apply_target
 
-from celery.tests.utils import Case, mask_modules, mock_module
+from celery.tests.case import Case, mask_modules, mock_module
 
 
 class test_NullDict(Case):

celery/tests/contrib/test_abortable.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from celery.contrib.abortable import AbortableTask, AbortableAsyncResult
 from celery.result import AsyncResult
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class MyAbortableTask(AbortableTask):

celery/tests/contrib/test_migrate.py

@@ -10,7 +10,7 @@ from celery.contrib.migrate import (
     migrate_tasks,
 )
 from celery.utils.encoding import bytes_t, ensure_bytes
-from celery.tests.utils import AppCase, Case, Mock
+from celery.tests.case import AppCase, Case, Mock
 
 
 def Message(body, exchange='exchange', routing_key='rkey',

celery/tests/contrib/test_rdb.py

@@ -10,7 +10,7 @@ from celery.contrib.rdb import (
     debugger,
     set_trace,
 )
-from celery.tests.utils import Case, WhateverIO, skip_if_pypy
+from celery.tests.case import Case, WhateverIO, skip_if_pypy
 
 
 class SockErr(socket.error):

celery/tests/events/test_cursesmon.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from nose import SkipTest
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class MockWindow(object):

celery/tests/events/test_events.py

@@ -6,7 +6,7 @@ from mock import Mock
 
 from celery import Celery
 from celery import events
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 
 class MockProducer(object):

celery/tests/events/test_snapshot.py

@@ -5,7 +5,7 @@ from mock import patch
 from celery.app import app_or_default
 from celery.events import Events
 from celery.events.snapshot import Polaroid, evcam
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class TRef(object):

celery/tests/events/test_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_WINDOW
 from celery.utils import uuid
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class replay(object):

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.imports import qualname
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 HOSTNAME = socket.gethostname()
 

celery/tests/security/case.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from nose import SkipTest
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class SecurityCase(Case):

celery/tests/security/test_certificate.py

@@ -8,7 +8,7 @@ from mock import Mock, patch
 from . import CERT1, CERT2, KEY1
 from .case import SecurityCase
 
-from celery.tests.utils import mock_open
+from celery.tests.case import mock_open
 
 
 class test_Certificate(SecurityCase):

celery/tests/security/test_security.py

@@ -27,7 +27,7 @@ from kombu.serialization import registry
 
 from .case import SecurityCase
 
-from celery.tests.utils import mock_open
+from celery.tests.case import mock_open
 
 
 class test_security(SecurityCase):

celery/tests/tasks/test_canvas.py

@@ -17,7 +17,7 @@ from celery.canvas import (
 )
 from celery.result import EagerResult
 
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 SIG = Signature({'task': 'TASK',
                  'args': ('A1', ),

celery/tests/tasks/test_chord.py

@@ -10,7 +10,7 @@ from celery.exceptions import ChordError
 from celery.five import range
 from celery.result import AsyncResult, GroupResult, EagerResult
 from celery.task import task, TaskSet
-from celery.tests.utils import AppCase, Mock
+from celery.tests.case import AppCase, Mock
 
 passthru = lambda x: x
 

celery/tests/tasks/test_context.py

@@ -4,7 +4,7 @@ from __future__ import absolute_import
 from collections import Callable
 
 from celery.task.base import Context
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 # Retreive the values of all context attributes as a

celery/tests/tasks/test_http.py

@@ -13,7 +13,7 @@ from kombu.utils.encoding import from_utf8
 
 from celery.five import StringIO, items
 from celery.task import http
-from celery.tests.utils import Case, eager_tasks
+from celery.tests.case import Case, eager_tasks
 
 
 @contextmanager

celery/tests/tasks/test_registry.py

@@ -7,7 +7,7 @@ from celery.app.registry import (
     _unpickle_task_v2,
 )
 from celery.task import Task, PeriodicTask
-from celery.tests.utils import AppCase, Case
+from celery.tests.case import AppCase, Case
 
 
 class MockTask(Task):

celery/tests/tasks/test_result.py

@@ -19,8 +19,8 @@ from celery.task.base import Task
 from celery.utils import uuid
 from celery.utils.serialization import pickle
 
-from celery.tests.utils import AppCase
-from celery.tests.utils import skip_if_quick
+from celery.tests.case import AppCase
+from celery.tests.case import skip_if_quick
 
 
 @task()

celery/tests/tasks/test_states.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from celery.states import state
 from celery import states
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_state_precedence(Case):

celery/tests/tasks/test_tasks.py

@@ -27,7 +27,7 @@ from celery.schedules import crontab, crontab_parser, ParseException
 from celery.utils import uuid
 from celery.utils.timeutils import parse_iso8601, timedelta_seconds
 
-from celery.tests.utils import Case, with_eager_tasks, WhateverIO
+from celery.tests.case import Case, with_eager_tasks, WhateverIO
 
 
 def now():

celery/tests/tasks/test_trace.py

@@ -13,7 +13,7 @@ from celery.task.trace import (
     setup_worker_optimizations,
     reset_worker_optimizations,
 )
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 
 def trace(task, args=(), kwargs={}, propagate=False, **opts):

celery/tests/utilities/test_compat.py → celery/tests/utils/test_compat.py

@@ -5,7 +5,7 @@ import celery
 from celery.app.task import Task as ModernTask
 from celery.task.base import Task as CompatTask
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_MagicModule(Case):

celery/tests/utilities/test_datastructures.py → celery/tests/utils/test_datastructures.py

@@ -9,7 +9,7 @@ from celery.datastructures import (
     DependencyGraph,
 )
 from celery.five import items
-from celery.tests.utils import Case, WhateverIO
+from celery.tests.case import Case, WhateverIO
 
 
 class Object(object):

celery/tests/utilities/test_dispatcher.py → celery/tests/utils/test_dispatcher.py

@@ -6,7 +6,7 @@ import sys
 import time
 
 from celery.utils.dispatch import Signal
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 if sys.platform.startswith('java'):

celery/tests/utilities/test_encoding.py → celery/tests/utils/test_encoding.py

@@ -6,7 +6,7 @@ from nose import SkipTest
 
 from celery.five import string
 from celery.utils import encoding
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_encoding(Case):

celery/tests/utilities/test_functional.py → celery/tests/utils/test_functional.py

@@ -14,7 +14,7 @@ from celery.utils.functional import (
     maybe_list,
 )
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_LRUCache(Case):

celery/tests/utilities/test_imports.py → celery/tests/utils/test_imports.py

@@ -10,7 +10,7 @@ from celery.utils.imports import (
     NotAPackage,
 )
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_import_utils(Case):

celery/tests/utilities/test_local.py → celery/tests/utils/test_local.py

@@ -9,7 +9,7 @@ from celery.local import (
     maybe_evaluate,
     try_import,
 )
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_try_import(Case):

celery/tests/utilities/test_mail.py → celery/tests/utils/test_mail.py

@@ -6,7 +6,7 @@ from mock import Mock, patch
 
 from celery.utils.mail import Message, Mailer
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 msg = Message(to='george@vandelay.com', sender='elaine@pendant.com',

celery/tests/utilities/test_pickle.py → celery/tests/utils/test_pickle.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from celery.utils.serialization import pickle
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class RegularException(Exception):

celery/tests/utilities/test_platforms.py → celery/tests/utils/test_platforms.py

@@ -31,7 +31,7 @@ from celery.platforms import (
     close_open_fds,
 )
 
-from celery.tests.utils import Case, WhateverIO, override_stdouts, mock_open
+from celery.tests.case import Case, WhateverIO, override_stdouts, mock_open
 
 
 class test_find_option_with_arg(Case):

celery/tests/utilities/test_saferef.py → celery/tests/utils/test_saferef.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from celery.five import range
 from celery.utils.dispatch.saferef import safe_ref
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class Class1(object):

celery/tests/utilities/test_serialization.py → celery/tests/utils/test_serialization.py

@@ -7,7 +7,7 @@ from celery.utils.serialization import (
     get_pickleable_etype,
 )
 
-from celery.tests.utils import Case, mask_modules
+from celery.tests.case import Case, mask_modules
 
 
 class test_AAPickle(Case):

celery/tests/utilities/test_sysinfo.py → celery/tests/utils/test_sysinfo.py

@@ -7,7 +7,7 @@ from nose import SkipTest
 
 from celery.utils.sysinfo import load_average, df
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_load_average(Case):

celery/tests/utilities/test_term.py → celery/tests/utils/test_term.py

@@ -4,7 +4,7 @@ from __future__ import absolute_import, unicode_literals
 from celery.utils import term
 from celery.utils.term import colored, fg
 
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_colored(Case):

celery/tests/utilities/test_text.py → celery/tests/utils/test_text.py

@@ -9,7 +9,7 @@ from celery.utils.text import (
     abbrtask,
     pretty,
 )
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 RANDTEXT = """\
 The quick brown

celery/tests/utilities/test_threads.py → celery/tests/utils/test_threads.py

@@ -10,7 +10,7 @@ from celery.utils.threads import (
     bgThread,
 )
 
-from celery.tests.utils import Case, override_stdouts
+from celery.tests.case import Case, override_stdouts
 
 
 class test_bgThread(Case):

celery/tests/utilities/test_timer2.py → celery/tests/utils/test_timer2.py

@@ -8,7 +8,7 @@ from mock import Mock, patch
 
 import celery.utils.timer2 as timer2
 
-from celery.tests.utils import Case, skip_if_quick
+from celery.tests.case import Case, skip_if_quick
 
 
 class test_Entry(Case):

celery/tests/utilities/test_timeutils.py → celery/tests/utils/test_timeutils.py

@@ -23,7 +23,7 @@ from celery.utils.timeutils import (
     utcoffset,
 )
 from celery.utils.iso8601 import parse_iso8601
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_LocalTimezone(Case):

celery/tests/utilities/test_utils.py → celery/tests/utils/test_utils.py

@@ -16,7 +16,7 @@ from celery.utils import (
     gen_task_name,
     jsonify,
 )
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 def double(x):

celery/tests/worker/test_autoreload.py

@@ -19,7 +19,7 @@ from celery.worker.autoreload import (
     Autoreloader,
 )
 
-from celery.tests.utils import AppCase, Case, mock_open
+from celery.tests.case import AppCase, Case, mock_open
 
 
 class test_WorkerComponent(AppCase):

celery/tests/worker/test_autoscale.py

@@ -9,7 +9,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 AppCase, sleepdeprived
+from celery.tests.case import AppCase, sleepdeprived
 
 
 class Object(object):

celery/tests/worker/test_bootsteps.py

@@ -4,7 +4,7 @@ from mock import Mock, patch
 
 from celery import bootsteps
 
-from celery.tests.utils import AppCase, Case
+from celery.tests.case import AppCase, Case
 
 
 class test_StepFormatter(Case):

celery/tests/worker/test_components.py

@@ -11,7 +11,7 @@ from celery.worker.components import (
     Pool,
 )
 
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 
 class test_Queues(AppCase):

celery/tests/worker/test_consumer.py

@@ -21,7 +21,7 @@ from celery.worker.consumer import (
     CLOSE,
 )
 
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 
 class test_Consumer(AppCase):

celery/tests/worker/test_control.py

@@ -22,7 +22,7 @@ from celery.worker.job import TaskRequest
 from celery.worker.state import revoked
 from celery.worker.control import Panel
 from celery.worker.pidbox import Pidbox, gPidbox
-from celery.tests.utils import AppCase
+from celery.tests.case import AppCase
 
 hostname = socket.gethostname()
 

celery/tests/worker/test_heartbeat.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from celery.worker.heartbeat import Heart
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class MockDispatcher(object):

celery/tests/worker/test_hub.py

@@ -12,7 +12,7 @@ from celery.worker.hub import (
 from mock import Mock, call, patch
 
 from celery.five import range
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class File(object):

celery/tests/worker/test_loops.py

@@ -10,7 +10,7 @@ from celery.worker import state
 from celery.worker.consumer import Consumer
 from celery.worker.loops import asynloop, synloop, CLOSE, READ, WRITE, ERR
 
-from celery.tests.utils import AppCase, body_from_sig
+from celery.tests.case import AppCase, body_from_sig
 
 
 class X(object):

celery/tests/worker/test_request.py

@@ -45,7 +45,7 @@ from celery.worker import job as module
 from celery.worker.job import Request, TaskRequest, logger as req_logger
 from celery.worker.state import revoked
 
-from celery.tests.utils import (
+from celery.tests.case import (
     AppCase,
     Case,
     assert_signal_called,

celery/tests/worker/test_revoke.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from celery.worker import state
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class test_revoked(Case):

celery/tests/worker/test_state.py

@@ -6,7 +6,7 @@ from time import time
 from celery.datastructures import LimitedSet
 from celery.exceptions import SystemTerminate
 from celery.worker import state
-from celery.tests.utils import Case
+from celery.tests.case import Case
 
 
 class StateResetCase(Case):

celery/tests/worker/test_strategy.py

@@ -10,7 +10,7 @@ from celery import Celery
 from celery.worker import state
 from celery.utils.timeutils import rate
 
-from celery.tests.utils import AppCase, body_from_sig
+from celery.tests.case import AppCase, body_from_sig
 
 
 class test_default_strategy(AppCase):

celery/tests/worker/test_worker.py

@@ -33,7 +33,7 @@ from celery.utils import worker_direct
 from celery.utils.serialization import pickle
 from celery.utils.timer2 import Timer
 
-from celery.tests.utils import AppCase, Case
+from celery.tests.case import AppCase, Case
 
 
 def MockStep(step=None):