Remove util packages

This patch moves modules under util/ packages out to the parent level.

blueprint refactor-system-tests

Change-Id: Ib148a75647e42d7bc2a81488e78c10adf4b849dc

marconi/tests/__init__.py

@@ -14,3 +14,9 @@
 # limitations under the License.
 
 """Marconi Unit-ish Tests"""
+
+from marconi.tests import base
+from marconi.tests import helpers
+
+TestBase = base.TestBase
+expect = helpers.expect

marconi/tests/common/test_cache.py

@@ -16,7 +16,7 @@
 
 import traceback
 
-from marconi.tests import util as testing
+from marconi import tests as testing
 
 
 class TestCache(testing.TestBase):

marconi/tests/functional/__init__.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Marconi Functional Tests"""
+"""Functional Test Utilities"""

marconi/tests/functional/util/__init__.py

@@ -1,16 +0,0 @@
-# Copyright (c) 2013 Rackspace Hosting, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Functional Test Utilities"""

marconi/tests/util/__init__.py

@@ -1,7 +0,0 @@
-"""Test utilities"""
-
-from marconi.tests.util import base
-from marconi.tests.util import helpers
-
-TestBase = base.TestBase
-expect = helpers.expect

tests/functional/test_claims.py

@@ -12,10 +12,10 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from marconi.tests.functional.util import base  # noqa
+from marconi.tests.functional import base  # noqa
-from marconi.tests.functional.util import config
+from marconi.tests.functional import config
-from marconi.tests.functional.util import helpers
+from marconi.tests.functional import helpers
-from marconi.tests.functional.util import http
+from marconi.tests.functional import http
 
 import ddt
 import json

tests/functional/test_messages.py

@@ -12,10 +12,10 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from marconi.tests.functional.util import base  # noqa
+from marconi.tests.functional import base  # noqa
-from marconi.tests.functional.util import config
+from marconi.tests.functional import config
-from marconi.tests.functional.util import helpers
+from marconi.tests.functional import helpers
-from marconi.tests.functional.util import http
+from marconi.tests.functional import http
 
 import ddt
 import uuid

tests/functional/test_queue.py

@@ -13,10 +13,10 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from marconi.tests.functional.util import base  # noqa
+from marconi.tests.functional import base  # noqa
-from marconi.tests.functional.util import config
+from marconi.tests.functional import config
-from marconi.tests.functional.util import helpers
+from marconi.tests.functional import helpers
-from marconi.tests.functional.util import http
+from marconi.tests.functional import http
 
 import copy
 import ddt

tests/storage/base.py

@@ -20,7 +20,7 @@ from testtools import matchers
 from marconi.openstack.common import timeutils
 from marconi import storage
 from marconi.storage import exceptions
-from marconi.tests import util as testing
+from marconi import tests as testing
 
 
 class ControllerBaseTest(testing.TestBase):

tests/storage/test_impl_mongodb.py

@@ -28,7 +28,7 @@ from marconi.storage import mongodb
 from marconi.storage.mongodb import controllers
 from marconi.storage.mongodb import options as mongodb_options
 from marconi.storage.mongodb import utils
-from marconi.tests import util as testing
+from marconi import tests as testing
 
 import base  # noqa  # noqa
 

tests/test_bootstrap.py

@@ -18,7 +18,7 @@ from oslo.config import cfg
 import marconi
 from marconi.common import exceptions
 from marconi.storage import sqlite
-from marconi.tests.util import base
+from marconi.tests import base
 from marconi.transport import wsgi
 
 

tests/test_config.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from marconi.common import config
-from marconi.tests import util as testing
+from marconi import tests as testing
 
 
 PROJECT_CONFIG = config.project()

tests/transport/test_auth.py

@@ -17,11 +17,11 @@
 from oslo.config import cfg
 
 from marconi.common import config
-from marconi.tests import util
+from marconi import tests as testing
 from marconi.transport import auth
 
 
-class TestTransportAuth(util.TestBase):
+class TestTransportAuth(testing.TestBase):
 
     def setUp(self):
         super(TestTransportAuth, self).setUp()

tests/transport/wsgi/base.py

@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from falcon import testing
+from falcon import testing as ftest
 
 import marconi
-from marconi.tests import util
+from marconi import tests as testing
-from marconi.tests.util import faulty_storage
+from marconi.tests import faulty_storage
 
 
-class TestBase(util.TestBase):
+class TestBase(testing.TestBase):
 
     config_filename = None
 
@@ -35,7 +35,7 @@ class TestBase(util.TestBase):
         boot = marconi.Bootstrap(conf_file)
 
         self.app = boot.transport.app
-        self.srmock = testing.StartResponseMock()
+        self.srmock = ftest.StartResponseMock()
 
     def simulate_request(self, path, project_id=None, **kwargs):
         """Simulate a request.
@@ -55,7 +55,7 @@ class TestBase(util.TestBase):
             headers['X-Project-ID'] = project_id
             kwargs['headers'] = headers
 
-        return self.app(testing.create_environ(path=path, **kwargs),
+        return self.app(ftest.create_environ(path=path, **kwargs),
                         self.srmock)
 
     def simulate_get(self, *args, **kwargs):