From e60e1ea81065b4180a950232d3677b1b1fc95e21 Mon Sep 17 00:00:00 2001 From: Fei Long Wang Date: Thu, 18 Dec 2014 14:29:15 +1300 Subject: [PATCH] Clean up the 'queues' package for tests Partially-Implements blueprint: notifications Change-Id: I768fcbc6266c737894ff2489049d3535df22e80e --- tests/unit/{queues => storage}/__init__.py | 0 .../{queues => }/storage/test_impl_mongodb.py | 2 +- .../{queues => }/storage/test_impl_redis.py | 2 +- .../storage/test_impl_sqlalchemy.py | 2 +- .../{queues => }/storage/test_pool_catalog.py | 0 .../{queues => }/storage/test_pool_queues.py | 0 .../{queues/storage => transport}/__init__.py | 0 .../unit/{queues => }/transport/test_auth.py | 0 .../transport => transport/wsgi}/__init__.py | 0 .../{queues => }/transport/wsgi/test_utils.py | 0 .../{queues => }/transport/wsgi/test_v1_0.py | 4 ++-- .../{queues => }/transport/wsgi/test_v1_1.py | 4 ++-- zaqar/tests/queues/transport/__init__.py | 0 .../wsgi => zaqar/tests/unit}/__init__.py | 0 .../{queues => unit/storage}/__init__.py | 0 zaqar/tests/{queues => unit}/storage/base.py | 0 .../storage => unit/transport}/__init__.py | 0 .../transport/wsgi/__init__.py | 2 +- .../{queues => unit}/transport/wsgi/base.py | 0 .../transport/wsgi/v1/__init__.py | 18 +++++++-------- .../transport/wsgi/v1/test_auth.py | 2 +- .../transport/wsgi/v1/test_claims.py | 2 +- .../transport/wsgi/v1/test_default_limits.py | 2 +- .../transport/wsgi/v1/test_home.py | 2 +- .../transport/wsgi/v1/test_media_type.py | 2 +- .../transport/wsgi/v1/test_messages.py | 2 +- .../transport/wsgi/v1/test_pools.py | 2 +- .../transport/wsgi/v1/test_queue_lifecycle.py | 2 +- .../transport/wsgi/v1/test_validation.py | 2 +- .../transport/wsgi/v1_1/__init__.py | 22 +++++++++---------- .../transport/wsgi/v1_1/test_auth.py | 2 +- .../transport/wsgi/v1_1/test_claims.py | 2 +- .../wsgi/v1_1/test_default_limits.py | 2 +- .../transport/wsgi/v1_1/test_flavors.py | 2 +- .../transport/wsgi/v1_1/test_health.py | 2 +- .../transport/wsgi/v1_1/test_home.py | 2 +- .../transport/wsgi/v1_1/test_media_type.py | 2 +- .../transport/wsgi/v1_1/test_messages.py | 2 +- .../transport/wsgi/v1_1/test_pools.py | 2 +- .../wsgi/v1_1/test_queue_lifecycle.py | 2 +- .../transport/wsgi/v1_1/test_validation.py | 2 +- 41 files changed, 48 insertions(+), 48 deletions(-) rename tests/unit/{queues => storage}/__init__.py (100%) rename tests/unit/{queues => }/storage/test_impl_mongodb.py (99%) rename tests/unit/{queues => }/storage/test_impl_redis.py (99%) rename tests/unit/{queues => }/storage/test_impl_sqlalchemy.py (99%) rename tests/unit/{queues => }/storage/test_pool_catalog.py (100%) rename tests/unit/{queues => }/storage/test_pool_queues.py (100%) rename tests/unit/{queues/storage => transport}/__init__.py (100%) rename tests/unit/{queues => }/transport/test_auth.py (100%) rename tests/unit/{queues/transport => transport/wsgi}/__init__.py (100%) rename tests/unit/{queues => }/transport/wsgi/test_utils.py (100%) rename tests/unit/{queues => }/transport/wsgi/test_v1_0.py (96%) rename tests/unit/{queues => }/transport/wsgi/test_v1_1.py (98%) delete mode 100644 zaqar/tests/queues/transport/__init__.py rename {tests/unit/queues/transport/wsgi => zaqar/tests/unit}/__init__.py (100%) rename zaqar/tests/{queues => unit/storage}/__init__.py (100%) rename zaqar/tests/{queues => unit}/storage/base.py (100%) rename zaqar/tests/{queues/storage => unit/transport}/__init__.py (100%) rename zaqar/tests/{queues => unit}/transport/wsgi/__init__.py (93%) rename zaqar/tests/{queues => unit}/transport/wsgi/base.py (100%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/__init__.py (72%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_auth.py (96%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_claims.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_default_limits.py (98%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_home.py (97%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_media_type.py (97%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_messages.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_pools.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_queue_lifecycle.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1/test_validation.py (98%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/__init__.py (69%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_auth.py (96%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_claims.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_default_limits.py (98%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_flavors.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_health.py (98%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_home.py (97%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_media_type.py (97%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_messages.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_pools.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_queue_lifecycle.py (99%) rename zaqar/tests/{queues => unit}/transport/wsgi/v1_1/test_validation.py (98%) diff --git a/tests/unit/queues/__init__.py b/tests/unit/storage/__init__.py similarity index 100% rename from tests/unit/queues/__init__.py rename to tests/unit/storage/__init__.py diff --git a/tests/unit/queues/storage/test_impl_mongodb.py b/tests/unit/storage/test_impl_mongodb.py similarity index 99% rename from tests/unit/queues/storage/test_impl_mongodb.py rename to tests/unit/storage/test_impl_mongodb.py index e4c71f3a9..31caa447b 100644 --- a/tests/unit/queues/storage/test_impl_mongodb.py +++ b/tests/unit/storage/test_impl_mongodb.py @@ -35,7 +35,7 @@ from zaqar.storage.mongodb import options from zaqar.storage.mongodb import utils from zaqar.storage import pooling from zaqar import tests as testing -from zaqar.tests.queues.storage import base +from zaqar.tests.unit.storage import base class MongodbSetupMixin(object): diff --git a/tests/unit/queues/storage/test_impl_redis.py b/tests/unit/storage/test_impl_redis.py similarity index 99% rename from tests/unit/queues/storage/test_impl_redis.py rename to tests/unit/storage/test_impl_redis.py index 86d3b1183..2d3719d3a 100644 --- a/tests/unit/queues/storage/test_impl_redis.py +++ b/tests/unit/storage/test_impl_redis.py @@ -29,7 +29,7 @@ from zaqar.storage.redis import messages from zaqar.storage.redis import options from zaqar.storage.redis import utils from zaqar import tests as testing -from zaqar.tests.queues.storage import base +from zaqar.tests.unit.storage import base def _create_sample_message(now=None, claimed=False, body=None): diff --git a/tests/unit/queues/storage/test_impl_sqlalchemy.py b/tests/unit/storage/test_impl_sqlalchemy.py similarity index 99% rename from tests/unit/queues/storage/test_impl_sqlalchemy.py rename to tests/unit/storage/test_impl_sqlalchemy.py index b48998502..a914a7644 100644 --- a/tests/unit/queues/storage/test_impl_sqlalchemy.py +++ b/tests/unit/storage/test_impl_sqlalchemy.py @@ -26,7 +26,7 @@ from zaqar.storage.sqlalchemy import controllers from zaqar.storage.sqlalchemy import tables from zaqar.storage.sqlalchemy import utils from zaqar import tests as testing -from zaqar.tests.queues.storage import base +from zaqar.tests.unit.storage import base class SqlalchemyTableTests(testing.TestBase): diff --git a/tests/unit/queues/storage/test_pool_catalog.py b/tests/unit/storage/test_pool_catalog.py similarity index 100% rename from tests/unit/queues/storage/test_pool_catalog.py rename to tests/unit/storage/test_pool_catalog.py diff --git a/tests/unit/queues/storage/test_pool_queues.py b/tests/unit/storage/test_pool_queues.py similarity index 100% rename from tests/unit/queues/storage/test_pool_queues.py rename to tests/unit/storage/test_pool_queues.py diff --git a/tests/unit/queues/storage/__init__.py b/tests/unit/transport/__init__.py similarity index 100% rename from tests/unit/queues/storage/__init__.py rename to tests/unit/transport/__init__.py diff --git a/tests/unit/queues/transport/test_auth.py b/tests/unit/transport/test_auth.py similarity index 100% rename from tests/unit/queues/transport/test_auth.py rename to tests/unit/transport/test_auth.py diff --git a/tests/unit/queues/transport/__init__.py b/tests/unit/transport/wsgi/__init__.py similarity index 100% rename from tests/unit/queues/transport/__init__.py rename to tests/unit/transport/wsgi/__init__.py diff --git a/tests/unit/queues/transport/wsgi/test_utils.py b/tests/unit/transport/wsgi/test_utils.py similarity index 100% rename from tests/unit/queues/transport/wsgi/test_utils.py rename to tests/unit/transport/wsgi/test_utils.py diff --git a/tests/unit/queues/transport/wsgi/test_v1_0.py b/tests/unit/transport/wsgi/test_v1_0.py similarity index 96% rename from tests/unit/queues/transport/wsgi/test_v1_0.py rename to tests/unit/transport/wsgi/test_v1_0.py index b31bdcb4e..e95c87b26 100644 --- a/tests/unit/queues/transport/wsgi/test_v1_0.py +++ b/tests/unit/transport/wsgi/test_v1_0.py @@ -14,8 +14,8 @@ import falcon -from zaqar.tests.queues.transport.wsgi import base -from zaqar.tests.queues.transport.wsgi import v1 +from zaqar.tests.unit.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import v1 # -------------------------------------------------------------------------- diff --git a/tests/unit/queues/transport/wsgi/test_v1_1.py b/tests/unit/transport/wsgi/test_v1_1.py similarity index 98% rename from tests/unit/queues/transport/wsgi/test_v1_1.py rename to tests/unit/transport/wsgi/test_v1_1.py index d7dbba112..05b7e0fd1 100644 --- a/tests/unit/queues/transport/wsgi/test_v1_1.py +++ b/tests/unit/transport/wsgi/test_v1_1.py @@ -17,8 +17,8 @@ import ddt import falcon from zaqar.openstack.common import jsonutils -from zaqar.tests.queues.transport.wsgi import base -from zaqar.tests.queues.transport.wsgi import v1_1 +from zaqar.tests.unit.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import v1_1 # -------------------------------------------------------------------------- # Identical or just minor variations across versions diff --git a/zaqar/tests/queues/transport/__init__.py b/zaqar/tests/queues/transport/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/unit/queues/transport/wsgi/__init__.py b/zaqar/tests/unit/__init__.py similarity index 100% rename from tests/unit/queues/transport/wsgi/__init__.py rename to zaqar/tests/unit/__init__.py diff --git a/zaqar/tests/queues/__init__.py b/zaqar/tests/unit/storage/__init__.py similarity index 100% rename from zaqar/tests/queues/__init__.py rename to zaqar/tests/unit/storage/__init__.py diff --git a/zaqar/tests/queues/storage/base.py b/zaqar/tests/unit/storage/base.py similarity index 100% rename from zaqar/tests/queues/storage/base.py rename to zaqar/tests/unit/storage/base.py diff --git a/zaqar/tests/queues/storage/__init__.py b/zaqar/tests/unit/transport/__init__.py similarity index 100% rename from zaqar/tests/queues/storage/__init__.py rename to zaqar/tests/unit/transport/__init__.py diff --git a/zaqar/tests/queues/transport/wsgi/__init__.py b/zaqar/tests/unit/transport/wsgi/__init__.py similarity index 93% rename from zaqar/tests/queues/transport/wsgi/__init__.py rename to zaqar/tests/unit/transport/wsgi/__init__.py index 2ff3aff77..4ef92ec09 100644 --- a/zaqar/tests/queues/transport/wsgi/__init__.py +++ b/zaqar/tests/unit/transport/wsgi/__init__.py @@ -15,7 +15,7 @@ # TODO(kgriffs): Consider consolidating all of these tests into a # single module. -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base TestBase = base.TestBase TestBaseFaulty = base.TestBaseFaulty diff --git a/zaqar/tests/queues/transport/wsgi/base.py b/zaqar/tests/unit/transport/wsgi/base.py similarity index 100% rename from zaqar/tests/queues/transport/wsgi/base.py rename to zaqar/tests/unit/transport/wsgi/base.py diff --git a/zaqar/tests/queues/transport/wsgi/v1/__init__.py b/zaqar/tests/unit/transport/wsgi/v1/__init__.py similarity index 72% rename from zaqar/tests/queues/transport/wsgi/v1/__init__.py rename to zaqar/tests/unit/transport/wsgi/v1/__init__.py index d086a8152..8c15fdca5 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/__init__.py +++ b/zaqar/tests/unit/transport/wsgi/v1/__init__.py @@ -12,15 +12,15 @@ # License for the specific language governing permissions and limitations under # the License. -from zaqar.tests.queues.transport.wsgi.v1 import test_auth -from zaqar.tests.queues.transport.wsgi.v1 import test_claims -from zaqar.tests.queues.transport.wsgi.v1 import test_default_limits -from zaqar.tests.queues.transport.wsgi.v1 import test_home -from zaqar.tests.queues.transport.wsgi.v1 import test_media_type -from zaqar.tests.queues.transport.wsgi.v1 import test_messages -from zaqar.tests.queues.transport.wsgi.v1 import test_pools -from zaqar.tests.queues.transport.wsgi.v1 import test_queue_lifecycle as l -from zaqar.tests.queues.transport.wsgi.v1 import test_validation +from zaqar.tests.unit.transport.wsgi.v1 import test_auth +from zaqar.tests.unit.transport.wsgi.v1 import test_claims +from zaqar.tests.unit.transport.wsgi.v1 import test_default_limits +from zaqar.tests.unit.transport.wsgi.v1 import test_home +from zaqar.tests.unit.transport.wsgi.v1 import test_media_type +from zaqar.tests.unit.transport.wsgi.v1 import test_messages +from zaqar.tests.unit.transport.wsgi.v1 import test_pools +from zaqar.tests.unit.transport.wsgi.v1 import test_queue_lifecycle as l +from zaqar.tests.unit.transport.wsgi.v1 import test_validation TestAuth = test_auth.TestAuth TestClaimsFaultyDriver = test_claims.TestClaimsFaultyDriver diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_auth.py b/zaqar/tests/unit/transport/wsgi/v1/test_auth.py similarity index 96% rename from zaqar/tests/queues/transport/wsgi/v1/test_auth.py rename to zaqar/tests/unit/transport/wsgi/v1/test_auth.py index 77773419b..fab0076f2 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_auth.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_auth.py @@ -20,7 +20,7 @@ import falcon from falcon import testing from keystonemiddleware import auth_token -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestAuth(base.V1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_claims.py b/zaqar/tests/unit/transport/wsgi/v1/test_claims.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1/test_claims.py rename to zaqar/tests/unit/transport/wsgi/v1/test_claims.py index ca3de83ad..78afd32e8 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_claims.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_claims.py @@ -24,7 +24,7 @@ from testtools import matchers from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base @ddt.ddt diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py b/zaqar/tests/unit/transport/wsgi/v1/test_default_limits.py similarity index 98% rename from zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py rename to zaqar/tests/unit/transport/wsgi/v1/test_default_limits.py index 575dfcf15..8665b1249 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_default_limits.py @@ -20,7 +20,7 @@ import falcon from zaqar.openstack.common import jsonutils from zaqar import storage -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestDefaultLimits(base.V1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_home.py b/zaqar/tests/unit/transport/wsgi/v1/test_home.py similarity index 97% rename from zaqar/tests/queues/transport/wsgi/v1/test_home.py rename to zaqar/tests/unit/transport/wsgi/v1/test_home.py index 8a5929c76..84569a04c 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_home.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_home.py @@ -16,7 +16,7 @@ import falcon import six.moves.urllib.parse as urlparse from zaqar.openstack.common import jsonutils -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestHomeDocument(base.V1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_media_type.py b/zaqar/tests/unit/transport/wsgi/v1/test_media_type.py similarity index 97% rename from zaqar/tests/queues/transport/wsgi/v1/test_media_type.py rename to zaqar/tests/unit/transport/wsgi/v1/test_media_type.py index 0f0485b14..af0dbb1b2 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_media_type.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_media_type.py @@ -19,7 +19,7 @@ import falcon from falcon import testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestMediaType(base.V1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_messages.py b/zaqar/tests/unit/transport/wsgi/v1/test_messages.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1/test_messages.py rename to zaqar/tests/unit/transport/wsgi/v1/test_messages.py index 4bd308993..61e36acc7 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_messages.py @@ -25,7 +25,7 @@ from testtools import matchers from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base from zaqar.transport import validation diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_pools.py b/zaqar/tests/unit/transport/wsgi/v1/test_pools.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1/test_pools.py rename to zaqar/tests/unit/transport/wsgi/v1/test_pools.py index fafa86507..e3b3c91a4 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_pools.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_pools.py @@ -20,7 +20,7 @@ import falcon from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base @contextlib.contextmanager diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py rename to zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py index 4855aefcf..8776d23bd 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py @@ -18,7 +18,7 @@ import six from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base @ddt.ddt diff --git a/zaqar/tests/queues/transport/wsgi/v1/test_validation.py b/zaqar/tests/unit/transport/wsgi/v1/test_validation.py similarity index 98% rename from zaqar/tests/queues/transport/wsgi/v1/test_validation.py rename to zaqar/tests/unit/transport/wsgi/v1/test_validation.py index daa833e25..937acd8ee 100644 --- a/zaqar/tests/queues/transport/wsgi/v1/test_validation.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_validation.py @@ -18,7 +18,7 @@ import uuid import falcon -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestValidation(base.V1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/__init__.py b/zaqar/tests/unit/transport/wsgi/v1_1/__init__.py similarity index 69% rename from zaqar/tests/queues/transport/wsgi/v1_1/__init__.py rename to zaqar/tests/unit/transport/wsgi/v1_1/__init__.py index aea8edd7f..2b7e798dc 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/__init__.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/__init__.py @@ -12,17 +12,17 @@ # License for the specific language governing permissions and limitations under # the License. -from zaqar.tests.queues.transport.wsgi.v1_1 import test_auth -from zaqar.tests.queues.transport.wsgi.v1_1 import test_claims -from zaqar.tests.queues.transport.wsgi.v1_1 import test_default_limits -from zaqar.tests.queues.transport.wsgi.v1_1 import test_flavors -from zaqar.tests.queues.transport.wsgi.v1_1 import test_health -from zaqar.tests.queues.transport.wsgi.v1_1 import test_home -from zaqar.tests.queues.transport.wsgi.v1_1 import test_media_type -from zaqar.tests.queues.transport.wsgi.v1_1 import test_messages -from zaqar.tests.queues.transport.wsgi.v1_1 import test_pools -from zaqar.tests.queues.transport.wsgi.v1_1 import test_queue_lifecycle as l -from zaqar.tests.queues.transport.wsgi.v1_1 import test_validation +from zaqar.tests.unit.transport.wsgi.v1_1 import test_auth +from zaqar.tests.unit.transport.wsgi.v1_1 import test_claims +from zaqar.tests.unit.transport.wsgi.v1_1 import test_default_limits +from zaqar.tests.unit.transport.wsgi.v1_1 import test_flavors +from zaqar.tests.unit.transport.wsgi.v1_1 import test_health +from zaqar.tests.unit.transport.wsgi.v1_1 import test_home +from zaqar.tests.unit.transport.wsgi.v1_1 import test_media_type +from zaqar.tests.unit.transport.wsgi.v1_1 import test_messages +from zaqar.tests.unit.transport.wsgi.v1_1 import test_pools +from zaqar.tests.unit.transport.wsgi.v1_1 import test_queue_lifecycle as l +from zaqar.tests.unit.transport.wsgi.v1_1 import test_validation TestAuth = test_auth.TestAuth TestClaimsFaultyDriver = test_claims.TestClaimsFaultyDriver diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_auth.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_auth.py similarity index 96% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_auth.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_auth.py index 3b53b152a..77aae3574 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_auth.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_auth.py @@ -20,7 +20,7 @@ import falcon from falcon import testing from keystonemiddleware import auth_token -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestAuth(base.V1_1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_claims.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_claims.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py index 40453feab..31bf7f4b6 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_claims.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py @@ -25,7 +25,7 @@ from testtools import matchers from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base @ddt.ddt diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_default_limits.py similarity index 98% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_default_limits.py index a0e1b5142..5657fad42 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_default_limits.py @@ -20,7 +20,7 @@ import falcon from zaqar.openstack.common import jsonutils from zaqar import storage -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestDefaultLimits(base.V1_1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_flavors.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_flavors.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py index b1753325e..2ea93bf27 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_flavors.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py @@ -20,7 +20,7 @@ import falcon from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base @contextlib.contextmanager diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_health.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py similarity index 98% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_health.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_health.py index 2693e9519..41e6512ee 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_health.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py @@ -22,7 +22,7 @@ from zaqar.openstack.common import jsonutils from zaqar.storage import errors import zaqar.storage.mongodb as mongo from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base @ddt.ddt diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_home.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_home.py similarity index 97% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_home.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_home.py index 4a9de5974..9f7e565a2 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_home.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_home.py @@ -18,7 +18,7 @@ import falcon import six.moves.urllib.parse as urlparse from zaqar.openstack.common import jsonutils -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestHomeDocument(base.V1_1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_media_type.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_media_type.py similarity index 97% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_media_type.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_media_type.py index 96f69a7d3..04b09e0fe 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_media_type.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_media_type.py @@ -18,7 +18,7 @@ import uuid import falcon from falcon import testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestMediaType(base.V1_1Base): diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py index e41c46b2c..4e3ab35d1 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py @@ -25,7 +25,7 @@ from testtools import matchers from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base from zaqar.transport import validation diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_pools.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_pools.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py index 8438f8cfe..59e7ea4f2 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_pools.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py @@ -20,7 +20,7 @@ import falcon from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base @contextlib.contextmanager diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py similarity index 99% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py index fda0b3559..7a1270683 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py @@ -20,7 +20,7 @@ import six from zaqar.openstack.common import jsonutils from zaqar import tests as testing -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base @ddt.ddt diff --git a/zaqar/tests/queues/transport/wsgi/v1_1/test_validation.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_validation.py similarity index 98% rename from zaqar/tests/queues/transport/wsgi/v1_1/test_validation.py rename to zaqar/tests/unit/transport/wsgi/v1_1/test_validation.py index 22503f751..bf1b6511a 100644 --- a/zaqar/tests/queues/transport/wsgi/v1_1/test_validation.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_validation.py @@ -18,7 +18,7 @@ import uuid import falcon -from zaqar.tests.queues.transport.wsgi import base +from zaqar.tests.unit.transport.wsgi import base class TestValidation(base.V1_1Base):