소스 검색

Don't use django-unittest-depth anymore

Mark Stover 15 년 전
부모
커밋
41a573c7d9
3개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 4 3
      celery/tests/__init__.py
  2. 1 1
      contrib/requirements/test.txt
  3. 1 2
      testproj/settings.py

+ 4 - 3
celery/tests/__init__.py

@@ -1,5 +1,6 @@
-from djangox.test.depth import alltests
+from django.db import connection
 
+from celery.utils import noop
 
-def suite():
-    return alltests(__file__, __name__)
+# FIXME This breaks the test-suite for some reason.
+connection.creation.destroy_test_db = noop

+ 1 - 1
contrib/requirements/test.txt

@@ -1,3 +1,4 @@
+django-unittest-depth
 nose
 nose-cover3
 nosexunit
@@ -5,4 +6,3 @@ django-nose
 pytyrant
 redis
 pymongo
-

+ 1 - 2
testproj/settings.py

@@ -37,7 +37,6 @@ NOSE_ARGS = [os.path.join(here, os.pardir, "celery", "tests"),
             "--cover3-package=celery",
             "--cover3-branch",
             "--cover3-exclude=%s" % ",".join(COVERAGE_EXCLUDE_MODULES)]
-TEST_DATABASE_NAME=":memory"
 
 BROKER_HOST = "localhost"
 BROKER_PORT = 5672
@@ -57,7 +56,7 @@ CELERY_QUEUES = {"testcelery": {"binding_key": "testcelery"}}
 MANAGERS = ADMINS
 
 DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = 'testdb.sqlite'
+DATABASE_NAME = ':memory'
 DATABASE_USER = ''
 DATABASE_PASSWORD = ''
 DATABASE_HOST = ''