From 2481c543f9ad48b207be1e221925eecad40166e1 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 10 Jan 2018 11:14:23 +0000 Subject: [PATCH] Re-home project Move project into a directory matching its name. Change-Id: I26934edd049909482ccc078d88b581fa369326b4 Signed-off-by: Stephen Finucane --- README.rst | 4 ++-- rhostest_tempest_plugin/README.rst | 6 ------ setup.cfg | 4 ++-- tox.ini | 2 +- .../__init__.py | 0 .../base.py | 2 +- .../config.py | 0 .../lib/__init__.py | 0 .../plugin.py | 7 ++++--- .../scenario/__init__.py | 0 .../scenario/test_pointer_device_type.py | 7 ++++--- .../scenario/test_refresh_quota_usages.py | 7 ++++--- .../services/__init__.py | 0 .../services/clients.py | 0 .../tests/__init__.py | 0 .../tests/base.py | 0 .../tests/test_placeholder.py | 2 +- 17 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 rhostest_tempest_plugin/README.rst rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/__init__.py (100%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/base.py (97%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/config.py (100%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/lib/__init__.py (100%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/plugin.py (87%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/scenario/__init__.py (100%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/scenario/test_pointer_device_type.py (95%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/scenario/test_refresh_quota_usages.py (96%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/services/__init__.py (100%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/services/clients.py (100%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/tests/__init__.py (100%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/tests/base.py (100%) rename {rhostest_tempest_plugin => whitebox_tempest_plugin}/tests/test_placeholder.py (94%) diff --git a/README.rst b/README.rst index 9b290043..e79bf7b9 100644 --- a/README.rst +++ b/README.rst @@ -54,12 +54,12 @@ Install, configure and run 3. Execute the tests. :: - tempest run --regex rhostest_tempest_plugin. + tempest run --regex whitebox_tempest_plugin. How to add a new test --------------------- -New tests should be added to the ``rhostest_tempest_plugin/tests`` directory. +New tests should be added to the ``whitebox_tempest_plugin/tests`` directory. According to the plugin interface doc__, you should mainly import "stable" APIs which usually are: diff --git a/rhostest_tempest_plugin/README.rst b/rhostest_tempest_plugin/README.rst deleted file mode 100644 index f2c48831..00000000 --- a/rhostest_tempest_plugin/README.rst +++ /dev/null @@ -1,6 +0,0 @@ -=============================================== -Tempest Integration of RHOSTest -=============================================== - -This directory contains Tempest tests to cover the RHOSTest project. - diff --git a/setup.cfg b/setup.cfg index 0a1fa775..cd15902a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,8 +22,8 @@ setup-hooks = [files] packages = - rhostest_tempest_plugin + whitebox_tempest_plugin [entry_points] tempest.test_plugins = - rhostest-tempest-plugin = rhostest_tempest_plugin.plugin:RHOSTempestPlugin + whitebox-tempest-plugin = whitebox_tempest_plugin.plugin:WhiteboxTempestPlugin diff --git a/tox.ini b/tox.ini index 6ba41ed3..56a81e8f 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ deps = -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete - stestr --test-path ./rhostest_tempest_plugin/tests run {posargs} + stestr --test-path ./whitebox_tempest_plugin/tests run {posargs} [testenv:flake8] commands = diff --git a/rhostest_tempest_plugin/__init__.py b/whitebox_tempest_plugin/__init__.py similarity index 100% rename from rhostest_tempest_plugin/__init__.py rename to whitebox_tempest_plugin/__init__.py diff --git a/rhostest_tempest_plugin/base.py b/whitebox_tempest_plugin/base.py similarity index 97% rename from rhostest_tempest_plugin/base.py rename to whitebox_tempest_plugin/base.py index 3eebeb47..e6ee3b38 100644 --- a/rhostest_tempest_plugin/base.py +++ b/whitebox_tempest_plugin/base.py @@ -24,7 +24,7 @@ CONF = config.CONF LOG = logging.getLogger(__name__) -class BaseRHOSTest(base.BaseV2ComputeAdminTest): +class BaseTest(base.BaseV2ComputeAdminTest): def _create_nova_flavor(self, name, ram, vcpus, disk, fid): # This function creates a flavor with provided parameters diff --git a/rhostest_tempest_plugin/config.py b/whitebox_tempest_plugin/config.py similarity index 100% rename from rhostest_tempest_plugin/config.py rename to whitebox_tempest_plugin/config.py diff --git a/rhostest_tempest_plugin/lib/__init__.py b/whitebox_tempest_plugin/lib/__init__.py similarity index 100% rename from rhostest_tempest_plugin/lib/__init__.py rename to whitebox_tempest_plugin/lib/__init__.py diff --git a/rhostest_tempest_plugin/plugin.py b/whitebox_tempest_plugin/plugin.py similarity index 87% rename from rhostest_tempest_plugin/plugin.py rename to whitebox_tempest_plugin/plugin.py index 1360ca48..8d5aadae 100644 --- a/rhostest_tempest_plugin/plugin.py +++ b/whitebox_tempest_plugin/plugin.py @@ -19,14 +19,15 @@ import os from tempest import config from tempest.test_discover import plugins -from rhostest_tempest_plugin import config as project_config +from whitebox_tempest_plugin import config as project_config -class RHOSTempestPlugin(plugins.TempestPlugin): +class WhiteboxTempestPlugin(plugins.TempestPlugin): + def load_tests(self): base_path = os.path.split(os.path.dirname( os.path.abspath(__file__)))[0] - test_dir = "rhostest_tempest_plugin/tests" + test_dir = 'whitebox_tempest_plugin/tests' full_test_dir = os.path.join(base_path, test_dir) return full_test_dir, base_path diff --git a/rhostest_tempest_plugin/scenario/__init__.py b/whitebox_tempest_plugin/scenario/__init__.py similarity index 100% rename from rhostest_tempest_plugin/scenario/__init__.py rename to whitebox_tempest_plugin/scenario/__init__.py diff --git a/rhostest_tempest_plugin/scenario/test_pointer_device_type.py b/whitebox_tempest_plugin/scenario/test_pointer_device_type.py similarity index 95% rename from rhostest_tempest_plugin/scenario/test_pointer_device_type.py rename to whitebox_tempest_plugin/scenario/test_pointer_device_type.py index 6b36afc6..7ab94fe7 100644 --- a/rhostest_tempest_plugin/scenario/test_pointer_device_type.py +++ b/whitebox_tempest_plugin/scenario/test_pointer_device_type.py @@ -23,17 +23,18 @@ # pointer_model=ps2mouse from oslo_log import log as logging -from rhostest_tempest_plugin import base -from rhostest_tempest_plugin.services import clients from tempest.common.utils import data_utils from tempest import config from tempest import test +from whitebox_tempest_plugin import base +from whitebox_tempest_plugin.services import clients + CONF = config.CONF LOG = logging.getLogger(__name__) -class PointerDeviceTypeFromImages(base.BaseRHOSTest): +class PointerDeviceTypeFromImages(base.BaseTest): @classmethod def setup_clients(cls): diff --git a/rhostest_tempest_plugin/scenario/test_refresh_quota_usages.py b/whitebox_tempest_plugin/scenario/test_refresh_quota_usages.py similarity index 96% rename from rhostest_tempest_plugin/scenario/test_refresh_quota_usages.py rename to whitebox_tempest_plugin/scenario/test_refresh_quota_usages.py index 868421e4..9a39786b 100644 --- a/rhostest_tempest_plugin/scenario/test_refresh_quota_usages.py +++ b/whitebox_tempest_plugin/scenario/test_refresh_quota_usages.py @@ -20,17 +20,18 @@ # target_private_key_path= from oslo_log import log as logging -from rhostest_tempest_plugin import base -from rhostest_tempest_plugin.services import clients from tempest.common.utils import data_utils from tempest import config from tempest import test +from whitebox_tempest_plugin import base +from whitebox_tempest_plugin.services import clients + CONF = config.CONF LOG = logging.getLogger(__name__) -class RefreshQuotaUsages(base.BaseRHOSTest): +class RefreshQuotaUsages(base.BaseTest): @classmethod def setup_clients(cls): diff --git a/rhostest_tempest_plugin/services/__init__.py b/whitebox_tempest_plugin/services/__init__.py similarity index 100% rename from rhostest_tempest_plugin/services/__init__.py rename to whitebox_tempest_plugin/services/__init__.py diff --git a/rhostest_tempest_plugin/services/clients.py b/whitebox_tempest_plugin/services/clients.py similarity index 100% rename from rhostest_tempest_plugin/services/clients.py rename to whitebox_tempest_plugin/services/clients.py diff --git a/rhostest_tempest_plugin/tests/__init__.py b/whitebox_tempest_plugin/tests/__init__.py similarity index 100% rename from rhostest_tempest_plugin/tests/__init__.py rename to whitebox_tempest_plugin/tests/__init__.py diff --git a/rhostest_tempest_plugin/tests/base.py b/whitebox_tempest_plugin/tests/base.py similarity index 100% rename from rhostest_tempest_plugin/tests/base.py rename to whitebox_tempest_plugin/tests/base.py diff --git a/rhostest_tempest_plugin/tests/test_placeholder.py b/whitebox_tempest_plugin/tests/test_placeholder.py similarity index 94% rename from rhostest_tempest_plugin/tests/test_placeholder.py rename to whitebox_tempest_plugin/tests/test_placeholder.py index fb497bff..39bd45a5 100644 --- a/rhostest_tempest_plugin/tests/test_placeholder.py +++ b/whitebox_tempest_plugin/tests/test_placeholder.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rhostest_tempest_plugin.tests import base +from whitebox_tempest_plugin.tests import base class PlaceholderTestCase(base.WhiteboxPluginTestCase):