diff --git a/tempest/tests/lib/base.py b/tempest/tests/base.py similarity index 100% rename from tempest/tests/lib/base.py rename to tempest/tests/base.py diff --git a/tempest/tests/cmd/test_javelin.py b/tempest/tests/cmd/test_javelin.py index b8c9969936..2d0256a333 100644 --- a/tempest/tests/cmd/test_javelin.py +++ b/tempest/tests/cmd/test_javelin.py @@ -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): diff --git a/tempest/tests/cmd/test_list_plugins.py b/tempest/tests/cmd/test_list_plugins.py index 782dde7416..17ddb18287 100644 --- a/tempest/tests/cmd/test_list_plugins.py +++ b/tempest/tests/cmd/test_list_plugins.py @@ -14,7 +14,7 @@ import subprocess -from tempest.tests.lib import base +from tempest.tests import base class TestTempestListPlugins(base.TestCase): diff --git a/tempest/tests/cmd/test_tempest_init.py b/tempest/tests/cmd/test_tempest_init.py index 6c5326a922..685a0b3e18 100644 --- a/tempest/tests/cmd/test_tempest_init.py +++ b/tempest/tests/cmd/test_tempest_init.py @@ -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): diff --git a/tempest/tests/cmd/test_verify_tempest_config.py b/tempest/tests/cmd/test_verify_tempest_config.py index 330c393f50..3b09673f98 100644 --- a/tempest/tests/cmd/test_verify_tempest_config.py +++ b/tempest/tests/cmd/test_verify_tempest_config.py @@ -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): diff --git a/tempest/tests/common/test_admin_available.py b/tempest/tests/common/test_admin_available.py index 7461c4b411..01a9cd0443 100644 --- a/tempest/tests/common/test_admin_available.py +++ b/tempest/tests/common/test_admin_available.py @@ -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): diff --git a/tempest/tests/common/test_alt_available.py b/tempest/tests/common/test_alt_available.py index 1a36068c5f..d4cfab6a31 100644 --- a/tempest/tests/common/test_alt_available.py +++ b/tempest/tests/common/test_alt_available.py @@ -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): diff --git a/tempest/tests/common/test_configured_creds.py b/tempest/tests/common/test_configured_creds.py index 2ce354d50f..3c242b36dc 100644 --- a/tempest/tests/common/test_configured_creds.py +++ b/tempest/tests/common/test_configured_creds.py @@ -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 diff --git a/tempest/tests/common/test_credentials.py b/tempest/tests/common/test_credentials.py index 3d09d9f8b2..00f2d39380 100644 --- a/tempest/tests/common/test_credentials.py +++ b/tempest/tests/common/test_credentials.py @@ -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): diff --git a/tempest/tests/common/test_custom_matchers.py b/tempest/tests/common/test_custom_matchers.py index d6649616fa..2656a4736d 100644 --- a/tempest/tests/common/test_custom_matchers.py +++ b/tempest/tests/common/test_custom_matchers.py @@ -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 diff --git a/tempest/tests/common/test_dynamic_creds.py b/tempest/tests/common/test_dynamic_creds.py index 1488793ac2..8d4f33bec0 100644 --- a/tempest/tests/common/test_dynamic_creds.py +++ b/tempest/tests/common/test_dynamic_creds.py @@ -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 diff --git a/tempest/tests/common/test_preprov_creds.py b/tempest/tests/common/test_preprov_creds.py index fba5b1f292..b595c8889b 100644 --- a/tempest/tests/common/test_preprov_creds.py +++ b/tempest/tests/common/test_preprov_creds.py @@ -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 diff --git a/tempest/tests/common/test_waiters.py b/tempest/tests/common/test_waiters.py index e0cef62f5c..492bdca898 100644 --- a/tempest/tests/common/test_waiters.py +++ b/tempest/tests/common/test_waiters.py @@ -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 diff --git a/tempest/tests/common/utils/linux/test_remote_client.py b/tempest/tests/common/utils/linux/test_remote_client.py index b3bba72b3e..e9146bcdad 100644 --- a/tempest/tests/common/utils/linux/test_remote_client.py +++ b/tempest/tests/common/utils/linux/test_remote_client.py @@ -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): diff --git a/tempest/tests/common/utils/test_file_utils.py b/tempest/tests/common/utils/test_file_utils.py index 1a14592281..937aefa323 100644 --- a/tempest/tests/common/utils/test_file_utils.py +++ b/tempest/tests/common/utils/test_file_utils.py @@ -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): diff --git a/tempest/tests/lib/cli/test_command_failed.py b/tempest/tests/lib/cli/test_command_failed.py index 8ce34c2f34..388028a9d6 100644 --- a/tempest/tests/lib/cli/test_command_failed.py +++ b/tempest/tests/lib/cli/test_command_failed.py @@ -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): diff --git a/tempest/tests/lib/cli/test_execute.py b/tempest/tests/lib/cli/test_execute.py index b5f7145f7c..b846c46c39 100644 --- a/tempest/tests/lib/cli/test_execute.py +++ b/tempest/tests/lib/cli/test_execute.py @@ -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): diff --git a/tempest/tests/lib/cli/test_output_parser.py b/tempest/tests/lib/cli/test_output_parser.py index a2c1b2d0ca..d88dfc36d9 100644 --- a/tempest/tests/lib/cli/test_output_parser.py +++ b/tempest/tests/lib/cli/test_output_parser.py @@ -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): diff --git a/tempest/tests/lib/common/test_api_version_request.py b/tempest/tests/lib/common/test_api_version_request.py index bdaa936511..58e7040bb6 100644 --- a/tempest/tests/lib/common/test_api_version_request.py +++ b/tempest/tests/lib/common/test_api_version_request.py @@ -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): diff --git a/tempest/tests/lib/common/test_api_version_utils.py b/tempest/tests/lib/common/test_api_version_utils.py index 591b87ed42..6206379d30 100644 --- a/tempest/tests/lib/common/test_api_version_utils.py +++ b/tempest/tests/lib/common/test_api_version_utils.py @@ -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): diff --git a/tempest/tests/lib/common/utils/test_data_utils.py b/tempest/tests/lib/common/utils/test_data_utils.py index 493df891a0..f4354613d4 100644 --- a/tempest/tests/lib/common/utils/test_data_utils.py +++ b/tempest/tests/lib/common/utils/test_data_utils.py @@ -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): diff --git a/tempest/tests/lib/common/utils/test_misc.py b/tempest/tests/lib/common/utils/test_misc.py index e23d7fb68c..9597f5bd12 100644 --- a/tempest/tests/lib/common/utils/test_misc.py +++ b/tempest/tests/lib/common/utils/test_misc.py @@ -15,7 +15,7 @@ from tempest.lib.common.utils import misc -from tempest.tests.lib import base +from tempest.tests import base @misc.singleton diff --git a/tempest/tests/lib/services/compute/base.py b/tempest/tests/lib/services/compute/base.py index c805de2e3f..e77b436071 100644 --- a/tempest/tests/lib/services/compute/base.py +++ b/tempest/tests/lib/services/compute/base.py @@ -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 diff --git a/tempest/tests/lib/services/identity/v2/test_token_client.py b/tempest/tests/lib/services/identity/v2/test_token_client.py index d91ecdc68e..7925152880 100644 --- a/tempest/tests/lib/services/identity/v2/test_token_client.py +++ b/tempest/tests/lib/services/identity/v2/test_token_client.py @@ -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 diff --git a/tempest/tests/lib/services/identity/v3/test_token_client.py b/tempest/tests/lib/services/identity/v3/test_token_client.py index 52b8e01cd7..e9ef740338 100644 --- a/tempest/tests/lib/services/identity/v3/test_token_client.py +++ b/tempest/tests/lib/services/identity/v3/test_token_client.py @@ -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 diff --git a/tempest/tests/lib/test_auth.py b/tempest/tests/lib/test_auth.py index 50ad5664d3..cc71c92f30 100644 --- a/tempest/tests/lib/test_auth.py +++ b/tempest/tests/lib/test_auth.py @@ -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 diff --git a/tempest/tests/lib/test_credentials.py b/tempest/tests/lib/test_credentials.py index b8acf83a7e..ca3baa135c 100644 --- a/tempest/tests/lib/test_credentials.py +++ b/tempest/tests/lib/test_credentials.py @@ -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 diff --git a/tempest/tests/lib/test_decorators.py b/tempest/tests/lib/test_decorators.py index f83bcbb54a..f3a4e9c039 100644 --- a/tempest/tests/lib/test_decorators.py +++ b/tempest/tests/lib/test_decorators.py @@ -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): diff --git a/tempest/tests/lib/test_rest_client.py b/tempest/tests/lib/test_rest_client.py index 572b4462ce..2959294e98 100644 --- a/tempest/tests/lib/test_rest_client.py +++ b/tempest/tests/lib/test_rest_client.py @@ -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 diff --git a/tempest/tests/lib/test_ssh.py b/tempest/tests/lib/test_ssh.py index d001c51b49..b07f6bccfb 100644 --- a/tempest/tests/lib/test_ssh.py +++ b/tempest/tests/lib/test_ssh.py @@ -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 diff --git a/tempest/tests/lib/test_tempest_lib.py b/tempest/tests/lib/test_tempest_lib.py index 9731e967b2..d70e53dee8 100644 --- a/tempest/tests/lib/test_tempest_lib.py +++ b/tempest/tests/lib/test_tempest_lib.py @@ -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): diff --git a/tempest/tests/negative/test_negative_auto_test.py b/tempest/tests/negative/test_negative_auto_test.py index 179546663d..44ce567d7a 100644 --- a/tempest/tests/negative/test_negative_auto_test.py +++ b/tempest/tests/negative/test_negative_auto_test.py @@ -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): diff --git a/tempest/tests/negative/test_negative_generators.py b/tempest/tests/negative/test_negative_generators.py index e0d7f421ec..78fd80d623 100644 --- a/tempest/tests/negative/test_negative_generators.py +++ b/tempest/tests/negative/test_negative_generators.py @@ -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): diff --git a/tempest/tests/stress/test_stress.py b/tempest/tests/stress/test_stress.py index a35b4d7034..dfe029163f 100644 --- a/tempest/tests/stress/test_stress.py +++ b/tempest/tests/stress/test_stress.py @@ -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__) diff --git a/tempest/tests/test_base_test.py b/tempest/tests/test_base_test.py index 9ffb7a1aa9..dc355b428d 100644 --- a/tempest/tests/test_base_test.py +++ b/tempest/tests/test_base_test.py @@ -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): diff --git a/tempest/tests/test_decorators.py b/tempest/tests/test_decorators.py index ee6867665a..7c9579bb12 100644 --- a/tempest/tests/test_decorators.py +++ b/tempest/tests/test_decorators.py @@ -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): diff --git a/tempest/tests/test_glance_http.py b/tempest/tests/test_glance_http.py index fdbc2d2613..768cd050c9 100644 --- a/tempest/tests/test_glance_http.py +++ b/tempest/tests/test_glance_http.py @@ -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 diff --git a/tempest/tests/test_hacking.py b/tempest/tests/test_hacking.py index 6b3aa0d03c..aba2aabce3 100644 --- a/tempest/tests/test_hacking.py +++ b/tempest/tests/test_hacking.py @@ -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): diff --git a/tempest/tests/test_list_tests.py b/tempest/tests/test_list_tests.py index 69527b1f74..38d4c5c0e6 100644 --- a/tempest/tests/test_list_tests.py +++ b/tempest/tests/test_list_tests.py @@ -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): diff --git a/tempest/tests/test_microversions.py b/tempest/tests/test_microversions.py index b80cf803a2..173accbd5b 100644 --- a/tempest/tests/test_microversions.py +++ b/tempest/tests/test_microversions.py @@ -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): diff --git a/tempest/tests/test_negative_rest_client.py b/tempest/tests/test_negative_rest_client.py index e46649c0ee..9d9c20f8b4 100644 --- a/tempest/tests/test_negative_rest_client.py +++ b/tempest/tests/test_negative_rest_client.py @@ -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): diff --git a/tempest/tests/test_tempest_plugin.py b/tempest/tests/test_tempest_plugin.py index f66dfc820c..c07e98c012 100644 --- a/tempest/tests/test_tempest_plugin.py +++ b/tempest/tests/test_tempest_plugin.py @@ -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): diff --git a/tempest/tests/test_wrappers.py b/tempest/tests/test_wrappers.py index edb9061512..a4ef699c47 100644 --- a/tempest/tests/test_wrappers.py +++ b/tempest/tests/test_wrappers.py @@ -19,7 +19,7 @@ import tempfile import six -from tempest.tests.lib import base +from tempest.tests import base DEVNULL = open(os.devnull, 'wb')