Clean up the 'queues' package for tests

Partially-Implements blueprint: notifications

Change-Id: I768fcbc6266c737894ff2489049d3535df22e80e

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):

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):

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):

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
 
 
 # --------------------------------------------------------------------------

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

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

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

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):

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

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):

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):

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):

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
 
 

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

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

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):

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

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):

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

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):

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

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

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):

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):

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
 
 

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

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

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):