From 3b04d3701c9271472702b2dcaaca421eb8ce560d Mon Sep 17 00:00:00 2001 From: Ethan Lynn Date: Tue, 12 Apr 2016 14:34:03 +0800 Subject: [PATCH] Rename tempest_tests to tempest Rename tempest_tests to tempest Change-Id: Ia8285afb3b8eba51fe3160643c5c04097839c92b --- senlin/tests/{tempest_tests => tempest}/README.rst | 2 +- senlin/tests/{tempest_tests => tempest}/__init__.py | 0 senlin/tests/{tempest_tests => tempest}/config.py | 0 senlin/tests/{tempest_tests => tempest}/plugin.py | 7 ++++--- .../tests/{tempest_tests => tempest}/services/__init__.py | 0 .../services/clustering/__init__.py | 0 .../services/clustering/clustering_client.py | 0 senlin/tests/{tempest_tests => tempest}/tests/__init__.py | 0 .../tests/{tempest_tests => tempest}/tests/api/__init__.py | 0 senlin/tests/{tempest_tests => tempest}/tests/api/base.py | 2 +- .../tests/api/test_cluster_basic.py | 4 ++-- .../{tempest_tests => tempest}/tests/common/__init__.py | 0 .../{tempest_tests => tempest}/tests/common/constants.py | 0 setup.cfg | 2 +- 14 files changed, 9 insertions(+), 8 deletions(-) rename senlin/tests/{tempest_tests => tempest}/README.rst (77%) rename senlin/tests/{tempest_tests => tempest}/__init__.py (100%) rename senlin/tests/{tempest_tests => tempest}/config.py (100%) rename senlin/tests/{tempest_tests => tempest}/plugin.py (88%) rename senlin/tests/{tempest_tests => tempest}/services/__init__.py (100%) rename senlin/tests/{tempest_tests => tempest}/services/clustering/__init__.py (100%) rename senlin/tests/{tempest_tests => tempest}/services/clustering/clustering_client.py (100%) rename senlin/tests/{tempest_tests => tempest}/tests/__init__.py (100%) rename senlin/tests/{tempest_tests => tempest}/tests/api/__init__.py (100%) rename senlin/tests/{tempest_tests => tempest}/tests/api/base.py (97%) rename senlin/tests/{tempest_tests => tempest}/tests/api/test_cluster_basic.py (97%) rename senlin/tests/{tempest_tests => tempest}/tests/common/__init__.py (100%) rename senlin/tests/{tempest_tests => tempest}/tests/common/constants.py (100%) diff --git a/senlin/tests/tempest_tests/README.rst b/senlin/tests/tempest/README.rst similarity index 77% rename from senlin/tests/tempest_tests/README.rst rename to senlin/tests/tempest/README.rst index 8ccb3d011..4132cd44f 100644 --- a/senlin/tests/tempest_tests/README.rst +++ b/senlin/tests/tempest/README.rst @@ -14,4 +14,4 @@ To run only these tests in tempest, go to tempest directory, then run:: To run a single test case, go to tempest directory, then run with test case name, e.g.:: - $ ./run_tempest.sh -N -- senlin.tests.tempest_tests.tests.api.test_cluster_basic.TestClusterBasic.test_cluster_create_delete \ No newline at end of file + $ ./run_tempest.sh -N -- senlin.tests.tempest.tests.api.test_cluster_basic.TestClusterBasic.test_cluster_create_delete \ No newline at end of file diff --git a/senlin/tests/tempest_tests/__init__.py b/senlin/tests/tempest/__init__.py similarity index 100% rename from senlin/tests/tempest_tests/__init__.py rename to senlin/tests/tempest/__init__.py diff --git a/senlin/tests/tempest_tests/config.py b/senlin/tests/tempest/config.py similarity index 100% rename from senlin/tests/tempest_tests/config.py rename to senlin/tests/tempest/config.py diff --git a/senlin/tests/tempest_tests/plugin.py b/senlin/tests/tempest/plugin.py similarity index 88% rename from senlin/tests/tempest_tests/plugin.py rename to senlin/tests/tempest/plugin.py index ad288dacc..0bb9ecdeb 100644 --- a/senlin/tests/tempest_tests/plugin.py +++ b/senlin/tests/tempest/plugin.py @@ -17,16 +17,17 @@ import os from tempest import config from tempest.test_discover import plugins -from senlin.tests.tempest_tests import config as config_senlin +from senlin.tests.tempest import config as config_senlin class SenlinTempestPlugin(plugins.TempestPlugin): def load_tests(self): base_path = os.path.split(os.path.dirname( os.path.abspath(__file__)))[0] - test_dir = "tempest_tests/tests" + base_path += '/../..' + test_dir = "senlin/tests/tempest/tests" full_test_dir = os.path.join(base_path, test_dir) - return full_test_dir, base_path+'/../..' + return full_test_dir, base_path def register_opts(self, conf): config.register_opt_group(conf, config_senlin.service_available_group, diff --git a/senlin/tests/tempest_tests/services/__init__.py b/senlin/tests/tempest/services/__init__.py similarity index 100% rename from senlin/tests/tempest_tests/services/__init__.py rename to senlin/tests/tempest/services/__init__.py diff --git a/senlin/tests/tempest_tests/services/clustering/__init__.py b/senlin/tests/tempest/services/clustering/__init__.py similarity index 100% rename from senlin/tests/tempest_tests/services/clustering/__init__.py rename to senlin/tests/tempest/services/clustering/__init__.py diff --git a/senlin/tests/tempest_tests/services/clustering/clustering_client.py b/senlin/tests/tempest/services/clustering/clustering_client.py similarity index 100% rename from senlin/tests/tempest_tests/services/clustering/clustering_client.py rename to senlin/tests/tempest/services/clustering/clustering_client.py diff --git a/senlin/tests/tempest_tests/tests/__init__.py b/senlin/tests/tempest/tests/__init__.py similarity index 100% rename from senlin/tests/tempest_tests/tests/__init__.py rename to senlin/tests/tempest/tests/__init__.py diff --git a/senlin/tests/tempest_tests/tests/api/__init__.py b/senlin/tests/tempest/tests/api/__init__.py similarity index 100% rename from senlin/tests/tempest_tests/tests/api/__init__.py rename to senlin/tests/tempest/tests/api/__init__.py diff --git a/senlin/tests/tempest_tests/tests/api/base.py b/senlin/tests/tempest/tests/api/base.py similarity index 97% rename from senlin/tests/tempest_tests/tests/api/base.py rename to senlin/tests/tempest/tests/api/base.py index 9445ee487..229c5efa4 100644 --- a/senlin/tests/tempest_tests/tests/api/base.py +++ b/senlin/tests/tempest/tests/api/base.py @@ -20,7 +20,7 @@ from tempest.lib import exceptions from tempest import test # from tempest_lib.common.utils import data_utils -from senlin.tests.tempest_tests.services.clustering import clustering_client +from senlin.tests.tempest.services.clustering import clustering_client CONF = config.CONF lOG = log.getLogger(__name__) diff --git a/senlin/tests/tempest_tests/tests/api/test_cluster_basic.py b/senlin/tests/tempest/tests/api/test_cluster_basic.py similarity index 97% rename from senlin/tests/tempest_tests/tests/api/test_cluster_basic.py rename to senlin/tests/tempest/tests/api/test_cluster_basic.py index 6a750be78..62bbb5403 100644 --- a/senlin/tests/tempest_tests/tests/api/test_cluster_basic.py +++ b/senlin/tests/tempest/tests/api/test_cluster_basic.py @@ -13,8 +13,8 @@ import copy from tempest.lib import decorators -from senlin.tests.tempest_tests.tests.api import base -from senlin.tests.tempest_tests.tests.common import constants +from senlin.tests.tempest.tests.api import base +from senlin.tests.tempest.tests.common import constants class TestClusterBasic(base.BaseSenlinTest): diff --git a/senlin/tests/tempest_tests/tests/common/__init__.py b/senlin/tests/tempest/tests/common/__init__.py similarity index 100% rename from senlin/tests/tempest_tests/tests/common/__init__.py rename to senlin/tests/tempest/tests/common/__init__.py diff --git a/senlin/tests/tempest_tests/tests/common/constants.py b/senlin/tests/tempest/tests/common/constants.py similarity index 100% rename from senlin/tests/tempest_tests/tests/common/constants.py rename to senlin/tests/tempest/tests/common/constants.py diff --git a/setup.cfg b/setup.cfg index 52581b7ac..acbc088e7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -51,7 +51,7 @@ senlin.drivers = openstack_test = senlin.tests.functional.drivers.openstack tempest.test_plugins = - senlin_tests = senlin.tests.tempest_tests.plugin:SenlinTempestPlugin + senlin_tests = senlin.tests.tempest.plugin:SenlinTempestPlugin [global] setup-hooks =