Fix base unit test class location

The recent commit I45d73891f3c0829a2378a032dfc02e5ac0ee34b7
deduplicated the base test class methods from the tempest.lib
reintegration. However the surviving base class was put in the wrong
namespace. The base class is just that a base to build the individual
test subclass off of. It's very confusing for that to not live in the
base tests namespace. While the code in lib is supposed to be self
contained there isn't a reason to do that here for the unit tests,
especially because in this case the import heiarchy becomes more
confusing with the base living in a submodule. This commit moves the
base class to the base tempest.tests namespace where it really
belongs.

Change-Id: I079eeb1135eed3254e5e9dbebac8a52b979303c7
This commit is contained in:
Matthew Treinish 2016-04-16 14:39:52 -04:00
parent d1c4d60457
commit ffad78a29f
No known key found for this signature in database
GPG Key ID: FD12A0F214C9E177
43 changed files with 42 additions and 42 deletions

View File

@ -17,7 +17,7 @@ from oslotest import mockpatch
from tempest.cmd import javelin
from tempest.lib import exceptions as lib_exc
from tempest.tests.lib import base
from tempest.tests import base
class JavelinUnitTest(base.TestCase):

View File

@ -14,7 +14,7 @@
import subprocess
from tempest.tests.lib import base
from tempest.tests import base
class TestTempestListPlugins(base.TestCase):

View File

@ -18,7 +18,7 @@ import shutil
import fixtures
from tempest.cmd import init
from tempest.tests.lib import base
from tempest.tests import base
class TestTempestInit(base.TestCase):

View File

@ -19,8 +19,8 @@ from oslotest import mockpatch
from tempest.cmd import verify_tempest_config
from tempest import config
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class TestGetAPIVersions(base.TestCase):

View File

@ -17,8 +17,8 @@ from oslotest import mockpatch
from tempest.common import credentials_factory as credentials
from tempest import config
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class TestAdminAvailable(base.TestCase):

View File

@ -17,8 +17,8 @@ from oslotest import mockpatch
from tempest.common import credentials_factory as credentials
from tempest import config
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class TestAltAvailable(base.TestCase):

View File

@ -21,8 +21,8 @@ from tempest.lib import auth
from tempest.lib import exceptions as lib_exc
from tempest.lib.services.identity.v2 import token_client as v2_client
from tempest.lib.services.identity.v3 import token_client as v3_client
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
from tempest.tests.lib import fake_identity

View File

@ -15,8 +15,8 @@
from tempest.common import credentials_factory as credentials
from tempest import config
from tempest import exceptions
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class TestLegacyCredentialsProvider(base.TestCase):

View File

@ -14,7 +14,7 @@
# under the License.
from tempest.common import custom_matchers
from tempest.tests.lib import base
from tempest.tests import base
from testtools.tests.matchers import helpers

View File

@ -31,8 +31,8 @@ from tempest.services.identity.v2.json import tenants_client as \
from tempest.services.identity.v2.json import users_client as \
json_users_client
from tempest.services.network.json import routers_client
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
from tempest.tests.lib import fake_http
from tempest.tests.lib import fake_identity

View File

@ -28,8 +28,8 @@ from tempest import config
from tempest.lib import auth
from tempest.lib import exceptions as lib_exc
from tempest.lib.services.identity.v2 import token_client
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
from tempest.tests.lib import fake_identity

View File

@ -19,7 +19,7 @@ import mock
from tempest.common import waiters
from tempest import exceptions
from tempest.services.volume.base import base_volumes_client
from tempest.tests.lib import base
from tempest.tests import base
import tempest.tests.utils as utils

View File

@ -19,8 +19,8 @@ from oslotest import mockpatch
from tempest.common.utils.linux import remote_client
from tempest import config
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class TestRemoteClient(base.TestCase):

View File

@ -16,7 +16,7 @@
import mock
from tempest.common.utils import file_utils
from tempest.tests.lib import base
from tempest.tests import base
class TestFileUtils(base.TestCase):

View File

@ -11,7 +11,7 @@
# under the License.
from tempest.lib import exceptions
from tempest.tests.lib import base
from tempest.tests import base
class TestOutputParser(base.TestCase):

View File

@ -14,7 +14,7 @@
from tempest.lib.cli import base as cli_base
from tempest.lib import exceptions
from tempest.tests.lib import base
from tempest.tests import base
class TestExecute(base.TestCase):

View File

@ -16,7 +16,7 @@
from tempest.lib.cli import output_parser
from tempest.lib import exceptions
from tempest.tests.lib import base
from tempest.tests import base
class TestOutputParser(base.TestCase):

View File

@ -14,7 +14,7 @@
from tempest.lib.common import api_version_request
from tempest.lib import exceptions
from tempest.tests.lib import base
from tempest.tests import base
class APIVersionRequestTests(base.TestCase):

View File

@ -16,7 +16,7 @@ import testtools
from tempest.lib.common import api_version_utils
from tempest.lib import exceptions
from tempest.tests.lib import base
from tempest.tests import base
class TestVersionSkipLogic(base.TestCase):

View File

@ -16,7 +16,7 @@
import netaddr
from tempest.lib.common.utils import data_utils
from tempest.tests.lib import base
from tempest.tests import base
class TestDataUtils(base.TestCase):

View File

@ -15,7 +15,7 @@
from tempest.lib.common.utils import misc
from tempest.tests.lib import base
from tempest.tests import base
@misc.singleton

View File

@ -15,7 +15,7 @@
from oslo_serialization import jsonutils as json
from oslotest import mockpatch
from tempest.tests.lib import base
from tempest.tests import base
from tempest.tests.lib import fake_http

View File

@ -19,7 +19,7 @@ import mock
from tempest.lib.common import rest_client
from tempest.lib import exceptions
from tempest.lib.services.identity.v2 import token_client
from tempest.tests.lib import base
from tempest.tests import base
from tempest.tests.lib import fake_http

View File

@ -19,7 +19,7 @@ import mock
from tempest.lib.common import rest_client
from tempest.lib import exceptions
from tempest.lib.services.identity.v3 import token_client
from tempest.tests.lib import base
from tempest.tests import base
from tempest.tests.lib import fake_http

View File

@ -22,7 +22,7 @@ from tempest.lib import auth
from tempest.lib import exceptions
from tempest.lib.services.identity.v2 import token_client as v2_client
from tempest.lib.services.identity.v3 import token_client as v3_client
from tempest.tests.lib import base
from tempest.tests import base
from tempest.tests.lib import fake_credentials
from tempest.tests.lib import fake_identity

View File

@ -19,7 +19,7 @@ from tempest.lib import auth
from tempest.lib import exceptions
from tempest.lib.services.identity.v2 import token_client as v2_client
from tempest.lib.services.identity.v3 import token_client as v3_client
from tempest.tests.lib import base
from tempest.tests import base
from tempest.tests.lib import fake_identity

View File

@ -18,7 +18,7 @@ import testtools
from tempest.lib import base as test
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from tempest.tests.lib import base
from tempest.tests import base
class TestSkipBecauseDecorator(base.TestCase):

View File

@ -22,7 +22,7 @@ import six
from tempest.lib.common import http
from tempest.lib.common import rest_client
from tempest.lib import exceptions
from tempest.tests.lib import base
from tempest.tests import base
from tempest.tests.lib import fake_auth_provider
from tempest.tests.lib import fake_http
import tempest.tests.utils as utils

View File

@ -21,7 +21,7 @@ import testtools
from tempest.lib.common import ssh
from tempest.lib import exceptions
from tempest.tests.lib import base
from tempest.tests import base
import tempest.tests.utils as utils

View File

@ -19,7 +19,7 @@ test_tempest.lib
Tests for `tempest.lib` module.
"""
from tempest.tests.lib import base
from tempest.tests import base
class TestTempest_lib(base.TestCase):

View File

@ -15,8 +15,8 @@
from tempest import config
import tempest.test as test
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class TestNegativeAutoTest(base.TestCase):

View File

@ -22,7 +22,7 @@ import six
from tempest.common.generator import base_generator
from tempest.common.generator import negative_generator
from tempest.common.generator import valid_generator
from tempest.tests.lib import base
from tempest.tests import base
class TestNegativeBasicGenerator(base.TestCase):

View File

@ -18,7 +18,7 @@ import subprocess
from oslo_log import log as logging
from tempest.lib import exceptions
from tempest.tests.lib import base
from tempest.tests import base
LOG = logging.getLogger(__name__)

View File

@ -19,8 +19,8 @@ from tempest.common import credentials_factory as credentials
from tempest.common import fixed_network
from tempest import config
from tempest import test
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class TestBaseTestCase(base.TestCase):

View File

@ -21,8 +21,8 @@ from tempest import config
from tempest import exceptions
from tempest.lib.common.utils import data_utils
from tempest import test
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class BaseDecoratorsTest(base.TestCase):

View File

@ -22,8 +22,8 @@ from six.moves import http_client as httplib
from tempest.common import glance_http
from tempest import exceptions
from tempest.tests import base
from tempest.tests import fake_auth_provider
from tempest.tests.lib import base
from tempest.tests.lib import fake_http

View File

@ -13,7 +13,7 @@
# under the License.
from tempest.hacking import checks
from tempest.tests.lib import base
from tempest.tests import base
class HackingTestCase(base.TestCase):

View File

@ -17,7 +17,7 @@ import re
import six
import subprocess
from tempest.tests.lib import base
from tempest.tests import base
class TestTestList(base.TestCase):

View File

@ -18,8 +18,8 @@ import testtools
from tempest.api.compute import base as compute_base
from tempest import config
from tempest.lib import exceptions
from tempest.tests import base
from tempest.tests import fake_config
from tempest.tests.lib import base
class VersionTestNoneTolatest(compute_base.BaseV2ComputeTest):

View File

@ -20,9 +20,9 @@ from oslotest import mockpatch
from tempest.common import negative_rest_client
from tempest import config
from tempest.tests import base
from tempest.tests import fake_auth_provider
from tempest.tests import fake_config
from tempest.tests.lib import base
class TestNegativeRestClient(base.TestCase):

View File

@ -14,8 +14,8 @@
# under the License.
from tempest.test_discover import plugins
from tempest.tests import base
from tempest.tests import fake_tempest_plugin as fake_plugin
from tempest.tests.lib import base
class TestPluginDiscovery(base.TestCase):

View File

@ -19,7 +19,7 @@ import tempfile
import six
from tempest.tests.lib import base
from tempest.tests import base
DEVNULL = open(os.devnull, 'wb')