diff --git a/funtests/__init__.py b/funtests/__init__.py new file mode 100644 index 00000000..46468510 --- /dev/null +++ b/funtests/__init__.py @@ -0,0 +1,3 @@ +import sys + +sys.path.append("..") diff --git a/kombu/tests/test_functional/__init__.py b/funtests/tests/__init__.py similarity index 100% rename from kombu/tests/test_functional/__init__.py rename to funtests/tests/__init__.py diff --git a/kombu/tests/test_functional/disabled_pika.py b/funtests/tests/disabled_pika.py similarity index 100% rename from kombu/tests/test_functional/disabled_pika.py rename to funtests/tests/disabled_pika.py diff --git a/kombu/tests/test_functional/test_amqplib.py b/funtests/tests/test_amqplib.py similarity index 65% rename from kombu/tests/test_functional/test_amqplib.py rename to funtests/tests/test_amqplib.py index 8b12bbd3..ec91250d 100644 --- a/kombu/tests/test_functional/test_amqplib.py +++ b/funtests/tests/test_amqplib.py @@ -1,4 +1,4 @@ -from kombu.tests.test_functional import transport +from funtests import transport class test_amqplib(transport.TransportCase): diff --git a/kombu/tests/test_functional/test_beanstalk.py b/funtests/tests/test_beanstalk.py similarity index 82% rename from kombu/tests/test_functional/test_beanstalk.py rename to funtests/tests/test_beanstalk.py index d726430a..93437527 100644 --- a/kombu/tests/test_functional/test_beanstalk.py +++ b/funtests/tests/test_beanstalk.py @@ -1,6 +1,6 @@ from nose import SkipTest -from kombu.tests.test_functional import transport +from funtests import transport class test_beanstalk(transport.TransportCase): diff --git a/kombu/tests/test_functional/test_django.py b/funtests/tests/test_django.py similarity index 94% rename from kombu/tests/test_functional/test_django.py rename to funtests/tests/test_django.py index 4bdc5e12..8425032d 100644 --- a/kombu/tests/test_functional/test_django.py +++ b/funtests/tests/test_django.py @@ -1,8 +1,9 @@ from nose import SkipTest -from kombu.tests.test_functional import transport from kombu.tests.utils import redirect_stdouts +from funtests import transport + class test_django(transport.TransportCase): transport = "django" diff --git a/kombu/tests/test_functional/test_mongodb.py b/funtests/tests/test_mongodb.py similarity index 79% rename from kombu/tests/test_functional/test_mongodb.py rename to funtests/tests/test_mongodb.py index 0acdf49d..8d6353c2 100644 --- a/kombu/tests/test_functional/test_mongodb.py +++ b/funtests/tests/test_mongodb.py @@ -1,4 +1,4 @@ -from kombu.tests.test_functional import transport +from funtests import transport class test_mongodb(transport.TransportCase): diff --git a/kombu/tests/test_functional/test_pycouchdb.py b/funtests/tests/test_pycouchdb.py similarity index 79% rename from kombu/tests/test_functional/test_pycouchdb.py rename to funtests/tests/test_pycouchdb.py index 7e45ec91..a6c5d6df 100644 --- a/kombu/tests/test_functional/test_pycouchdb.py +++ b/funtests/tests/test_pycouchdb.py @@ -1,4 +1,4 @@ -from kombu.tests.test_functional import transport +from funtests import transport class test_couchdb(transport.TransportCase): diff --git a/kombu/tests/test_functional/test_redis.py b/funtests/tests/test_redis.py similarity index 79% rename from kombu/tests/test_functional/test_redis.py rename to funtests/tests/test_redis.py index 94d0211d..94703515 100644 --- a/kombu/tests/test_functional/test_redis.py +++ b/funtests/tests/test_redis.py @@ -1,4 +1,4 @@ -from kombu.tests.test_functional import transport +from funtests import transport class test_redis(transport.TransportCase): diff --git a/kombu/tests/test_functional/test_sqla.py b/funtests/tests/test_sqla.py similarity index 73% rename from kombu/tests/test_functional/test_sqla.py rename to funtests/tests/test_sqla.py index d19a4d01..79afbd8c 100644 --- a/kombu/tests/test_functional/test_sqla.py +++ b/funtests/tests/test_sqla.py @@ -1,6 +1,6 @@ from nose import SkipTest -from kombu.tests.test_functional import transport +from funtests import transport class test_sqla(transport.TransportCase): @@ -13,4 +13,4 @@ class test_sqla(transport.TransportCase): try: import sqlakombu except ImportError: - raise SkipTest("sqlalchemy-kombu not installed") + raise SkipTest("kombu-sqlalchemy not installed") diff --git a/kombu/tests/test_functional/transport.py b/funtests/transport.py similarity index 100% rename from kombu/tests/test_functional/transport.py rename to funtests/transport.py