From 30ae1e72f1bb21e2c0eb8cc11bec43b4872b55bd Mon Sep 17 00:00:00 2001 From: Anton Arefiev Date: Tue, 5 Apr 2016 11:04:59 +0300 Subject: [PATCH] Move unit tests to "unit" directory This refoctor is needed for tempest test work as tempest tests will placed in test dir. So move unit tests to separate directory "unit" under test. Change-Id: Ic99df6111ef30947148a9e38b9435a54f3d37064 --- ironic_inspector/test/unit/__init__.py | 0 ironic_inspector/test/{ => unit}/test_common_ironic.py | 0 ironic_inspector/test/{ => unit}/test_firewall.py | 0 ironic_inspector/test/{ => unit}/test_introspect.py | 0 ironic_inspector/test/{ => unit}/test_keystone.py | 0 ironic_inspector/test/{ => unit}/test_main.py | 0 ironic_inspector/test/{ => unit}/test_migrations.py | 0 ironic_inspector/test/{ => unit}/test_node_cache.py | 0 ironic_inspector/test/{ => unit}/test_plugins_base.py | 0 ironic_inspector/test/{ => unit}/test_plugins_discovery.py | 0 .../test/{ => unit}/test_plugins_extra_hardware.py | 0 ironic_inspector/test/{ => unit}/test_plugins_raid_device.py | 0 ironic_inspector/test/{ => unit}/test_plugins_rules.py | 0 ironic_inspector/test/{ => unit}/test_plugins_standard.py | 0 ironic_inspector/test/{ => unit}/test_process.py | 0 ironic_inspector/test/{ => unit}/test_rules.py | 0 ironic_inspector/test/{ => unit}/test_swift.py | 0 ironic_inspector/test/{ => unit}/test_utils.py | 0 tox.ini | 4 ++-- 19 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 ironic_inspector/test/unit/__init__.py rename ironic_inspector/test/{ => unit}/test_common_ironic.py (100%) rename ironic_inspector/test/{ => unit}/test_firewall.py (100%) rename ironic_inspector/test/{ => unit}/test_introspect.py (100%) rename ironic_inspector/test/{ => unit}/test_keystone.py (100%) rename ironic_inspector/test/{ => unit}/test_main.py (100%) rename ironic_inspector/test/{ => unit}/test_migrations.py (100%) rename ironic_inspector/test/{ => unit}/test_node_cache.py (100%) rename ironic_inspector/test/{ => unit}/test_plugins_base.py (100%) rename ironic_inspector/test/{ => unit}/test_plugins_discovery.py (100%) rename ironic_inspector/test/{ => unit}/test_plugins_extra_hardware.py (100%) rename ironic_inspector/test/{ => unit}/test_plugins_raid_device.py (100%) rename ironic_inspector/test/{ => unit}/test_plugins_rules.py (100%) rename ironic_inspector/test/{ => unit}/test_plugins_standard.py (100%) rename ironic_inspector/test/{ => unit}/test_process.py (100%) rename ironic_inspector/test/{ => unit}/test_rules.py (100%) rename ironic_inspector/test/{ => unit}/test_swift.py (100%) rename ironic_inspector/test/{ => unit}/test_utils.py (100%) diff --git a/ironic_inspector/test/unit/__init__.py b/ironic_inspector/test/unit/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/ironic_inspector/test/test_common_ironic.py b/ironic_inspector/test/unit/test_common_ironic.py similarity index 100% rename from ironic_inspector/test/test_common_ironic.py rename to ironic_inspector/test/unit/test_common_ironic.py diff --git a/ironic_inspector/test/test_firewall.py b/ironic_inspector/test/unit/test_firewall.py similarity index 100% rename from ironic_inspector/test/test_firewall.py rename to ironic_inspector/test/unit/test_firewall.py diff --git a/ironic_inspector/test/test_introspect.py b/ironic_inspector/test/unit/test_introspect.py similarity index 100% rename from ironic_inspector/test/test_introspect.py rename to ironic_inspector/test/unit/test_introspect.py diff --git a/ironic_inspector/test/test_keystone.py b/ironic_inspector/test/unit/test_keystone.py similarity index 100% rename from ironic_inspector/test/test_keystone.py rename to ironic_inspector/test/unit/test_keystone.py diff --git a/ironic_inspector/test/test_main.py b/ironic_inspector/test/unit/test_main.py similarity index 100% rename from ironic_inspector/test/test_main.py rename to ironic_inspector/test/unit/test_main.py diff --git a/ironic_inspector/test/test_migrations.py b/ironic_inspector/test/unit/test_migrations.py similarity index 100% rename from ironic_inspector/test/test_migrations.py rename to ironic_inspector/test/unit/test_migrations.py diff --git a/ironic_inspector/test/test_node_cache.py b/ironic_inspector/test/unit/test_node_cache.py similarity index 100% rename from ironic_inspector/test/test_node_cache.py rename to ironic_inspector/test/unit/test_node_cache.py diff --git a/ironic_inspector/test/test_plugins_base.py b/ironic_inspector/test/unit/test_plugins_base.py similarity index 100% rename from ironic_inspector/test/test_plugins_base.py rename to ironic_inspector/test/unit/test_plugins_base.py diff --git a/ironic_inspector/test/test_plugins_discovery.py b/ironic_inspector/test/unit/test_plugins_discovery.py similarity index 100% rename from ironic_inspector/test/test_plugins_discovery.py rename to ironic_inspector/test/unit/test_plugins_discovery.py diff --git a/ironic_inspector/test/test_plugins_extra_hardware.py b/ironic_inspector/test/unit/test_plugins_extra_hardware.py similarity index 100% rename from ironic_inspector/test/test_plugins_extra_hardware.py rename to ironic_inspector/test/unit/test_plugins_extra_hardware.py diff --git a/ironic_inspector/test/test_plugins_raid_device.py b/ironic_inspector/test/unit/test_plugins_raid_device.py similarity index 100% rename from ironic_inspector/test/test_plugins_raid_device.py rename to ironic_inspector/test/unit/test_plugins_raid_device.py diff --git a/ironic_inspector/test/test_plugins_rules.py b/ironic_inspector/test/unit/test_plugins_rules.py similarity index 100% rename from ironic_inspector/test/test_plugins_rules.py rename to ironic_inspector/test/unit/test_plugins_rules.py diff --git a/ironic_inspector/test/test_plugins_standard.py b/ironic_inspector/test/unit/test_plugins_standard.py similarity index 100% rename from ironic_inspector/test/test_plugins_standard.py rename to ironic_inspector/test/unit/test_plugins_standard.py diff --git a/ironic_inspector/test/test_process.py b/ironic_inspector/test/unit/test_process.py similarity index 100% rename from ironic_inspector/test/test_process.py rename to ironic_inspector/test/unit/test_process.py diff --git a/ironic_inspector/test/test_rules.py b/ironic_inspector/test/unit/test_rules.py similarity index 100% rename from ironic_inspector/test/test_rules.py rename to ironic_inspector/test/unit/test_rules.py diff --git a/ironic_inspector/test/test_swift.py b/ironic_inspector/test/unit/test_swift.py similarity index 100% rename from ironic_inspector/test/test_swift.py rename to ironic_inspector/test/unit/test_swift.py diff --git a/ironic_inspector/test/test_utils.py b/ironic_inspector/test/unit/test_utils.py similarity index 100% rename from ironic_inspector/test/test_utils.py rename to ironic_inspector/test/unit/test_utils.py diff --git a/tox.ini b/tox.ini index 891c23464..6ca9f2653 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ deps = -r{toxinidir}/test-requirements.txt -r{toxinidir}/plugin-requirements.txt commands = - coverage run --branch --include "ironic_inspector*" -m unittest discover ironic_inspector.test + coverage run --branch --include "ironic_inspector*" -m unittest discover ironic_inspector.test.unit coverage report -m --fail-under 90 setenv = PYTHONDONTWRITEBYTECODE=1 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY @@ -21,7 +21,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen [testenv:cover] commands = - coverage run --branch --include "ironic_inspector*" -m unittest discover ironic_inspector.test + coverage run --branch --include "ironic_inspector*" -m unittest discover ironic_inspector.test.unit coverage report -m [testenv:pep8]