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:
parent
d1c4d60457
commit
ffad78a29f
|
@ -17,7 +17,7 @@ from oslotest import mockpatch
|
||||||
|
|
||||||
from tempest.cmd import javelin
|
from tempest.cmd import javelin
|
||||||
from tempest.lib import exceptions as lib_exc
|
from tempest.lib import exceptions as lib_exc
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class JavelinUnitTest(base.TestCase):
|
class JavelinUnitTest(base.TestCase):
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestTempestListPlugins(base.TestCase):
|
class TestTempestListPlugins(base.TestCase):
|
||||||
|
|
|
@ -18,7 +18,7 @@ import shutil
|
||||||
import fixtures
|
import fixtures
|
||||||
|
|
||||||
from tempest.cmd import init
|
from tempest.cmd import init
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestTempestInit(base.TestCase):
|
class TestTempestInit(base.TestCase):
|
||||||
|
|
|
@ -19,8 +19,8 @@ from oslotest import mockpatch
|
||||||
|
|
||||||
from tempest.cmd import verify_tempest_config
|
from tempest.cmd import verify_tempest_config
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestGetAPIVersions(base.TestCase):
|
class TestGetAPIVersions(base.TestCase):
|
||||||
|
|
|
@ -17,8 +17,8 @@ from oslotest import mockpatch
|
||||||
|
|
||||||
from tempest.common import credentials_factory as credentials
|
from tempest.common import credentials_factory as credentials
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestAdminAvailable(base.TestCase):
|
class TestAdminAvailable(base.TestCase):
|
||||||
|
|
|
@ -17,8 +17,8 @@ from oslotest import mockpatch
|
||||||
|
|
||||||
from tempest.common import credentials_factory as credentials
|
from tempest.common import credentials_factory as credentials
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestAltAvailable(base.TestCase):
|
class TestAltAvailable(base.TestCase):
|
||||||
|
|
|
@ -21,8 +21,8 @@ from tempest.lib import auth
|
||||||
from tempest.lib import exceptions as lib_exc
|
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.v2 import token_client as v2_client
|
||||||
from tempest.lib.services.identity.v3 import token_client as v3_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 import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
from tempest.tests.lib import fake_identity
|
from tempest.tests.lib import fake_identity
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
from tempest.common import credentials_factory as credentials
|
from tempest.common import credentials_factory as credentials
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest import exceptions
|
from tempest import exceptions
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestLegacyCredentialsProvider(base.TestCase):
|
class TestLegacyCredentialsProvider(base.TestCase):
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from tempest.common import custom_matchers
|
from tempest.common import custom_matchers
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
from testtools.tests.matchers import helpers
|
from testtools.tests.matchers import helpers
|
||||||
|
|
||||||
|
|
|
@ -31,8 +31,8 @@ from tempest.services.identity.v2.json import tenants_client as \
|
||||||
from tempest.services.identity.v2.json import users_client as \
|
from tempest.services.identity.v2.json import users_client as \
|
||||||
json_users_client
|
json_users_client
|
||||||
from tempest.services.network.json import routers_client
|
from tempest.services.network.json import routers_client
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
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_http
|
||||||
from tempest.tests.lib import fake_identity
|
from tempest.tests.lib import fake_identity
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,8 @@ from tempest import config
|
||||||
from tempest.lib import auth
|
from tempest.lib import auth
|
||||||
from tempest.lib import exceptions as lib_exc
|
from tempest.lib import exceptions as lib_exc
|
||||||
from tempest.lib.services.identity.v2 import token_client
|
from tempest.lib.services.identity.v2 import token_client
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
from tempest.tests.lib import fake_identity
|
from tempest.tests.lib import fake_identity
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import mock
|
||||||
from tempest.common import waiters
|
from tempest.common import waiters
|
||||||
from tempest import exceptions
|
from tempest import exceptions
|
||||||
from tempest.services.volume.base import base_volumes_client
|
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
|
import tempest.tests.utils as utils
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,8 @@ from oslotest import mockpatch
|
||||||
|
|
||||||
from tempest.common.utils.linux import remote_client
|
from tempest.common.utils.linux import remote_client
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestRemoteClient(base.TestCase):
|
class TestRemoteClient(base.TestCase):
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
from tempest.common.utils import file_utils
|
from tempest.common.utils import file_utils
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestFileUtils(base.TestCase):
|
class TestFileUtils(base.TestCase):
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestOutputParser(base.TestCase):
|
class TestOutputParser(base.TestCase):
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from tempest.lib.cli import base as cli_base
|
from tempest.lib.cli import base as cli_base
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestExecute(base.TestCase):
|
class TestExecute(base.TestCase):
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
from tempest.lib.cli import output_parser
|
from tempest.lib.cli import output_parser
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestOutputParser(base.TestCase):
|
class TestOutputParser(base.TestCase):
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from tempest.lib.common import api_version_request
|
from tempest.lib.common import api_version_request
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class APIVersionRequestTests(base.TestCase):
|
class APIVersionRequestTests(base.TestCase):
|
||||||
|
|
|
@ -16,7 +16,7 @@ import testtools
|
||||||
|
|
||||||
from tempest.lib.common import api_version_utils
|
from tempest.lib.common import api_version_utils
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestVersionSkipLogic(base.TestCase):
|
class TestVersionSkipLogic(base.TestCase):
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
import netaddr
|
import netaddr
|
||||||
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestDataUtils(base.TestCase):
|
class TestDataUtils(base.TestCase):
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
|
|
||||||
from tempest.lib.common.utils import misc
|
from tempest.lib.common.utils import misc
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
@misc.singleton
|
@misc.singleton
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
from oslo_serialization import jsonutils as json
|
from oslo_serialization import jsonutils as json
|
||||||
from oslotest import mockpatch
|
from oslotest import mockpatch
|
||||||
|
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
from tempest.tests.lib import fake_http
|
from tempest.tests.lib import fake_http
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import mock
|
||||||
from tempest.lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.lib.services.identity.v2 import token_client
|
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
|
from tempest.tests.lib import fake_http
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import mock
|
||||||
from tempest.lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.lib.services.identity.v3 import token_client
|
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
|
from tempest.tests.lib import fake_http
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ from tempest.lib import auth
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.lib.services.identity.v2 import token_client as v2_client
|
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.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_credentials
|
||||||
from tempest.tests.lib import fake_identity
|
from tempest.tests.lib import fake_identity
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ from tempest.lib import auth
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.lib.services.identity.v2 import token_client as v2_client
|
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.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
|
from tempest.tests.lib import fake_identity
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ import testtools
|
||||||
from tempest.lib import base as test
|
from tempest.lib import base as test
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestSkipBecauseDecorator(base.TestCase):
|
class TestSkipBecauseDecorator(base.TestCase):
|
||||||
|
|
|
@ -22,7 +22,7 @@ import six
|
||||||
from tempest.lib.common import http
|
from tempest.lib.common import http
|
||||||
from tempest.lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
from tempest.lib import exceptions
|
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_auth_provider
|
||||||
from tempest.tests.lib import fake_http
|
from tempest.tests.lib import fake_http
|
||||||
import tempest.tests.utils as utils
|
import tempest.tests.utils as utils
|
||||||
|
|
|
@ -21,7 +21,7 @@ import testtools
|
||||||
|
|
||||||
from tempest.lib.common import ssh
|
from tempest.lib.common import ssh
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
import tempest.tests.utils as utils
|
import tempest.tests.utils as utils
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ test_tempest.lib
|
||||||
Tests for `tempest.lib` module.
|
Tests for `tempest.lib` module.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestTempest_lib(base.TestCase):
|
class TestTempest_lib(base.TestCase):
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
import tempest.test as test
|
import tempest.test as test
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestNegativeAutoTest(base.TestCase):
|
class TestNegativeAutoTest(base.TestCase):
|
||||||
|
|
|
@ -22,7 +22,7 @@ import six
|
||||||
from tempest.common.generator import base_generator
|
from tempest.common.generator import base_generator
|
||||||
from tempest.common.generator import negative_generator
|
from tempest.common.generator import negative_generator
|
||||||
from tempest.common.generator import valid_generator
|
from tempest.common.generator import valid_generator
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestNegativeBasicGenerator(base.TestCase):
|
class TestNegativeBasicGenerator(base.TestCase):
|
||||||
|
|
|
@ -18,7 +18,7 @@ import subprocess
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,8 @@ from tempest.common import credentials_factory as credentials
|
||||||
from tempest.common import fixed_network
|
from tempest.common import fixed_network
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest import test
|
from tempest import test
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestBaseTestCase(base.TestCase):
|
class TestBaseTestCase(base.TestCase):
|
||||||
|
|
|
@ -21,8 +21,8 @@ from tempest import config
|
||||||
from tempest import exceptions
|
from tempest import exceptions
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest import test
|
from tempest import test
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class BaseDecoratorsTest(base.TestCase):
|
class BaseDecoratorsTest(base.TestCase):
|
||||||
|
|
|
@ -22,8 +22,8 @@ from six.moves import http_client as httplib
|
||||||
|
|
||||||
from tempest.common import glance_http
|
from tempest.common import glance_http
|
||||||
from tempest import exceptions
|
from tempest import exceptions
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_auth_provider
|
from tempest.tests import fake_auth_provider
|
||||||
from tempest.tests.lib import base
|
|
||||||
from tempest.tests.lib import fake_http
|
from tempest.tests.lib import fake_http
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from tempest.hacking import checks
|
from tempest.hacking import checks
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class HackingTestCase(base.TestCase):
|
class HackingTestCase(base.TestCase):
|
||||||
|
|
|
@ -17,7 +17,7 @@ import re
|
||||||
import six
|
import six
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestTestList(base.TestCase):
|
class TestTestList(base.TestCase):
|
||||||
|
|
|
@ -18,8 +18,8 @@ import testtools
|
||||||
from tempest.api.compute import base as compute_base
|
from tempest.api.compute import base as compute_base
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class VersionTestNoneTolatest(compute_base.BaseV2ComputeTest):
|
class VersionTestNoneTolatest(compute_base.BaseV2ComputeTest):
|
||||||
|
|
|
@ -20,9 +20,9 @@ from oslotest import mockpatch
|
||||||
|
|
||||||
from tempest.common import negative_rest_client
|
from tempest.common import negative_rest_client
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_auth_provider
|
from tempest.tests import fake_auth_provider
|
||||||
from tempest.tests import fake_config
|
from tempest.tests import fake_config
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestNegativeRestClient(base.TestCase):
|
class TestNegativeRestClient(base.TestCase):
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from tempest.test_discover import plugins
|
from tempest.test_discover import plugins
|
||||||
|
from tempest.tests import base
|
||||||
from tempest.tests import fake_tempest_plugin as fake_plugin
|
from tempest.tests import fake_tempest_plugin as fake_plugin
|
||||||
from tempest.tests.lib import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestPluginDiscovery(base.TestCase):
|
class TestPluginDiscovery(base.TestCase):
|
||||||
|
|
|
@ -19,7 +19,7 @@ import tempfile
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from tempest.tests.lib import base
|
from tempest.tests import base
|
||||||
|
|
||||||
DEVNULL = open(os.devnull, 'wb')
|
DEVNULL = open(os.devnull, 'wb')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue