From aa039bb01139ee7ec1b0609c1ad2ef7fa037a749 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 31 Mar 2015 10:41:36 -0400 Subject: [PATCH] Make room for functional tests We need to consolidate the unit tests into a separate directory so we can run just the unit tests in our py27 tox target. And we can in subsequent reviews add a parallel directory with functional tests. Related-Bug: #1439621 Change-Id: I8bf5af953fb31080096c371966f7dfda9edb1bf4 --- .testr.conf | 2 +- magnum/tests/test_magnum.py | 28 ------------------- magnum/tests/test_units.py | 19 ------------- magnum/tests/{api => unit}/__init__.py | 0 .../{api/controllers => unit/api}/__init__.py | 0 magnum/tests/{ => unit}/api/base.py | 2 +- .../v1 => unit/api/controllers}/__init__.py | 0 .../{ => unit}/api/controllers/test_root.py | 0 .../api/controllers/v1}/__init__.py | 0 .../api/controllers/v1/test_base.py | 0 .../{ => unit}/api/controllers/v1/test_bay.py | 6 ++-- .../api/controllers/v1/test_baymodel.py | 6 ++-- .../api/controllers/v1/test_container.py | 2 +- .../api/controllers/v1/test_node.py | 6 ++-- .../{ => unit}/api/controllers/v1/test_pod.py | 6 ++-- .../v1/test_replicationcontroller.py | 6 ++-- .../api/controllers/v1/test_service.py | 6 ++-- .../api/controllers/v1/test_types.py | 2 +- .../api/controllers/v1/test_utils.py | 2 +- magnum/tests/{ => unit}/api/test_app.py | 0 magnum/tests/{ => unit}/api/test_auth.py | 0 magnum/tests/{ => unit}/api/test_hooks.py | 2 +- magnum/tests/{ => unit}/api/utils.py | 2 +- .../{conductor => unit/common}/__init__.py | 0 .../tests/{ => unit}/common/test_clients.py | 0 .../tests/{ => unit}/common/test_context.py | 0 .../tests/{ => unit}/common/test_exception.py | 0 .../{ => unit}/common/test_k8s_manifest.py | 0 .../common/test_magnum_keystoneclient.py | 0 .../tests/{ => unit}/common/test_safeutils.py | 0 .../tests/{ => unit}/common/test_short_id.py | 0 .../tests/{ => unit}/common/test_urlfetch.py | 0 magnum/tests/{ => unit}/common/test_utils.py | 0 .../tests/{ => unit}/common/test_yamlutils.py | 0 .../handlers => unit/conductor}/__init__.py | 0 .../conductor/handlers}/__init__.py | 0 .../conductor/handlers/common}/__init__.py | 0 .../handlers/common/test_kube_utils.py | 0 .../conductor/handlers/test_bay_k8s_heat.py | 4 +-- .../handlers/test_docker_conductor.py | 0 .../conductor/handlers/test_kube.py | 0 .../{db => unit/conductor/tasks}/__init__.py | 0 .../conductor/tasks/test_heat_tasks.py | 0 .../tests/{ => unit}/conductor/test_rpcapi.py | 4 +-- .../{db/sqlalchemy => unit/db}/__init__.py | 0 magnum/tests/{ => unit}/db/base.py | 0 .../db/sqlalchemy}/__init__.py | 0 .../{ => unit}/db/sqlalchemy/test_types.py | 2 +- magnum/tests/{ => unit}/db/test_bay.py | 4 +-- magnum/tests/{ => unit}/db/test_baymodel.py | 4 +-- magnum/tests/{ => unit}/db/test_container.py | 4 +-- magnum/tests/{ => unit}/db/test_node.py | 4 +-- magnum/tests/{ => unit}/db/test_pod.py | 4 +-- .../db/test_replicationcontroller.py | 4 +-- magnum/tests/{ => unit}/db/test_service.py | 4 +-- magnum/tests/{ => unit}/db/utils.py | 0 magnum/tests/unit/objects/__init__.py | 0 magnum/tests/{ => unit}/objects/test_bay.py | 4 +-- .../tests/{ => unit}/objects/test_baymodel.py | 4 +-- .../{ => unit}/objects/test_container.py | 4 +-- magnum/tests/{ => unit}/objects/test_node.py | 4 +-- .../tests/{ => unit}/objects/test_objects.py | 0 .../objects/test_objects_sqlalchemy.py | 0 magnum/tests/{ => unit}/objects/test_pod.py | 4 +-- .../objects/test_replicationcontroller.py | 4 +-- .../tests/{ => unit}/objects/test_service.py | 4 +-- magnum/tests/{ => unit}/objects/utils.py | 2 +- 67 files changed, 59 insertions(+), 106 deletions(-) delete mode 100644 magnum/tests/test_magnum.py delete mode 100644 magnum/tests/test_units.py rename magnum/tests/{api => unit}/__init__.py (100%) rename magnum/tests/{api/controllers => unit/api}/__init__.py (100%) rename magnum/tests/{ => unit}/api/base.py (99%) rename magnum/tests/{api/controllers/v1 => unit/api/controllers}/__init__.py (100%) rename magnum/tests/{ => unit}/api/controllers/test_root.py (100%) rename magnum/tests/{common => unit/api/controllers/v1}/__init__.py (100%) rename magnum/tests/{ => unit}/api/controllers/v1/test_base.py (100%) rename magnum/tests/{ => unit}/api/controllers/v1/test_bay.py (99%) rename magnum/tests/{ => unit}/api/controllers/v1/test_baymodel.py (99%) rename magnum/tests/{ => unit}/api/controllers/v1/test_container.py (98%) rename magnum/tests/{ => unit}/api/controllers/v1/test_node.py (98%) rename magnum/tests/{ => unit}/api/controllers/v1/test_pod.py (99%) rename magnum/tests/{ => unit}/api/controllers/v1/test_replicationcontroller.py (99%) rename magnum/tests/{ => unit}/api/controllers/v1/test_service.py (99%) rename magnum/tests/{ => unit}/api/controllers/v1/test_types.py (99%) rename magnum/tests/{ => unit}/api/controllers/v1/test_utils.py (97%) rename magnum/tests/{ => unit}/api/test_app.py (100%) rename magnum/tests/{ => unit}/api/test_auth.py (100%) rename magnum/tests/{ => unit}/api/test_hooks.py (99%) rename magnum/tests/{ => unit}/api/utils.py (98%) rename magnum/tests/{conductor => unit/common}/__init__.py (100%) rename magnum/tests/{ => unit}/common/test_clients.py (100%) rename magnum/tests/{ => unit}/common/test_context.py (100%) rename magnum/tests/{ => unit}/common/test_exception.py (100%) rename magnum/tests/{ => unit}/common/test_k8s_manifest.py (100%) rename magnum/tests/{ => unit}/common/test_magnum_keystoneclient.py (100%) rename magnum/tests/{ => unit}/common/test_safeutils.py (100%) rename magnum/tests/{ => unit}/common/test_short_id.py (100%) rename magnum/tests/{ => unit}/common/test_urlfetch.py (100%) rename magnum/tests/{ => unit}/common/test_utils.py (100%) rename magnum/tests/{ => unit}/common/test_yamlutils.py (100%) rename magnum/tests/{conductor/handlers => unit/conductor}/__init__.py (100%) rename magnum/tests/{conductor/handlers/common => unit/conductor/handlers}/__init__.py (100%) rename magnum/tests/{conductor/tasks => unit/conductor/handlers/common}/__init__.py (100%) rename magnum/tests/{ => unit}/conductor/handlers/common/test_kube_utils.py (100%) rename magnum/tests/{ => unit}/conductor/handlers/test_bay_k8s_heat.py (99%) rename magnum/tests/{ => unit}/conductor/handlers/test_docker_conductor.py (100%) rename magnum/tests/{ => unit}/conductor/handlers/test_kube.py (100%) rename magnum/tests/{db => unit/conductor/tasks}/__init__.py (100%) rename magnum/tests/{ => unit}/conductor/tasks/test_heat_tasks.py (100%) rename magnum/tests/{ => unit}/conductor/test_rpcapi.py (98%) rename magnum/tests/{db/sqlalchemy => unit/db}/__init__.py (100%) rename magnum/tests/{ => unit}/db/base.py (100%) rename magnum/tests/{objects => unit/db/sqlalchemy}/__init__.py (100%) rename magnum/tests/{ => unit}/db/sqlalchemy/test_types.py (98%) rename magnum/tests/{ => unit}/db/test_bay.py (98%) rename magnum/tests/{ => unit}/db/test_baymodel.py (98%) rename magnum/tests/{ => unit}/db/test_container.py (98%) rename magnum/tests/{ => unit}/db/test_node.py (98%) rename magnum/tests/{ => unit}/db/test_pod.py (98%) rename magnum/tests/{ => unit}/db/test_replicationcontroller.py (98%) rename magnum/tests/{ => unit}/db/test_service.py (98%) rename magnum/tests/{ => unit}/db/utils.py (100%) create mode 100644 magnum/tests/unit/objects/__init__.py rename magnum/tests/{ => unit}/objects/test_bay.py (98%) rename magnum/tests/{ => unit}/objects/test_baymodel.py (98%) rename magnum/tests/{ => unit}/objects/test_container.py (98%) rename magnum/tests/{ => unit}/objects/test_node.py (98%) rename magnum/tests/{ => unit}/objects/test_objects.py (100%) rename magnum/tests/{ => unit}/objects/test_objects_sqlalchemy.py (100%) rename magnum/tests/{ => unit}/objects/test_pod.py (98%) rename magnum/tests/{ => unit}/objects/test_replicationcontroller.py (98%) rename magnum/tests/{ => unit}/objects/test_service.py (98%) rename magnum/tests/{ => unit}/objects/utils.py (99%) diff --git a/.testr.conf b/.testr.conf index 13ec54bab8..ae9ca6e90b 100644 --- a/.testr.conf +++ b/.testr.conf @@ -2,6 +2,6 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \ - ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./magnum/tests} $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./magnum/tests/unit} $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/magnum/tests/test_magnum.py b/magnum/tests/test_magnum.py deleted file mode 100644 index 8173a921e7..0000000000 --- a/magnum/tests/test_magnum.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -test_magnum ----------------------------------- - -Tests for `magnum` module. -""" - -from magnum.tests import base - - -class TestMagnum(base.TestCase): - - def test_something(self): - pass diff --git a/magnum/tests/test_units.py b/magnum/tests/test_units.py deleted file mode 100644 index 75a76d6a4c..0000000000 --- a/magnum/tests/test_units.py +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import unittest - - -class TestUnits(unittest.TestCase): - - def test_units(self): - assert 5 * 5 == 25 diff --git a/magnum/tests/api/__init__.py b/magnum/tests/unit/__init__.py similarity index 100% rename from magnum/tests/api/__init__.py rename to magnum/tests/unit/__init__.py diff --git a/magnum/tests/api/controllers/__init__.py b/magnum/tests/unit/api/__init__.py similarity index 100% rename from magnum/tests/api/controllers/__init__.py rename to magnum/tests/unit/api/__init__.py diff --git a/magnum/tests/api/base.py b/magnum/tests/unit/api/base.py similarity index 99% rename from magnum/tests/api/base.py rename to magnum/tests/unit/api/base.py index ea531a3346..8bbfd47040 100644 --- a/magnum/tests/api/base.py +++ b/magnum/tests/unit/api/base.py @@ -27,7 +27,7 @@ from six.moves.urllib import parse as urlparse from magnum.api import hooks from magnum.db import api as dbapi -from magnum.tests.db import base +from magnum.tests.unit.db import base PATH_PREFIX = '/v1' diff --git a/magnum/tests/api/controllers/v1/__init__.py b/magnum/tests/unit/api/controllers/__init__.py similarity index 100% rename from magnum/tests/api/controllers/v1/__init__.py rename to magnum/tests/unit/api/controllers/__init__.py diff --git a/magnum/tests/api/controllers/test_root.py b/magnum/tests/unit/api/controllers/test_root.py similarity index 100% rename from magnum/tests/api/controllers/test_root.py rename to magnum/tests/unit/api/controllers/test_root.py diff --git a/magnum/tests/common/__init__.py b/magnum/tests/unit/api/controllers/v1/__init__.py similarity index 100% rename from magnum/tests/common/__init__.py rename to magnum/tests/unit/api/controllers/v1/__init__.py diff --git a/magnum/tests/api/controllers/v1/test_base.py b/magnum/tests/unit/api/controllers/v1/test_base.py similarity index 100% rename from magnum/tests/api/controllers/v1/test_base.py rename to magnum/tests/unit/api/controllers/v1/test_base.py diff --git a/magnum/tests/api/controllers/v1/test_bay.py b/magnum/tests/unit/api/controllers/v1/test_bay.py similarity index 99% rename from magnum/tests/api/controllers/v1/test_bay.py rename to magnum/tests/unit/api/controllers/v1/test_bay.py index 4bea614808..333b52d202 100644 --- a/magnum/tests/api/controllers/v1/test_bay.py +++ b/magnum/tests/unit/api/controllers/v1/test_bay.py @@ -22,10 +22,10 @@ from magnum.api.controllers.v1 import bay as api_bay from magnum.common import utils from magnum.conductor import api as rpcapi from magnum import objects -from magnum.tests.api import base as api_base -from magnum.tests.api import utils as apiutils from magnum.tests import base -from magnum.tests.objects import utils as obj_utils +from magnum.tests.unit.api import base as api_base +from magnum.tests.unit.api import utils as apiutils +from magnum.tests.unit.objects import utils as obj_utils class TestBayObject(base.TestCase): diff --git a/magnum/tests/api/controllers/v1/test_baymodel.py b/magnum/tests/unit/api/controllers/v1/test_baymodel.py similarity index 99% rename from magnum/tests/api/controllers/v1/test_baymodel.py rename to magnum/tests/unit/api/controllers/v1/test_baymodel.py index d168c6f311..0c209c4426 100644 --- a/magnum/tests/api/controllers/v1/test_baymodel.py +++ b/magnum/tests/unit/api/controllers/v1/test_baymodel.py @@ -21,10 +21,10 @@ from wsme import types as wtypes from magnum.api.controllers.v1 import baymodel as api_baymodel from magnum.common import utils -from magnum.tests.api import base as api_base -from magnum.tests.api import utils as apiutils from magnum.tests import base -from magnum.tests.objects import utils as obj_utils +from magnum.tests.unit.api import base as api_base +from magnum.tests.unit.api import utils as apiutils +from magnum.tests.unit.objects import utils as obj_utils class TestBayModelObject(base.TestCase): diff --git a/magnum/tests/api/controllers/v1/test_container.py b/magnum/tests/unit/api/controllers/v1/test_container.py similarity index 98% rename from magnum/tests/api/controllers/v1/test_container.py rename to magnum/tests/unit/api/controllers/v1/test_container.py index 5963159308..6d76f83ac9 100644 --- a/magnum/tests/api/controllers/v1/test_container.py +++ b/magnum/tests/unit/api/controllers/v1/test_container.py @@ -9,7 +9,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from magnum.tests.db import base as db_base +from magnum.tests.unit.db import base as db_base from mock import patch from webtest.app import AppError diff --git a/magnum/tests/api/controllers/v1/test_node.py b/magnum/tests/unit/api/controllers/v1/test_node.py similarity index 98% rename from magnum/tests/api/controllers/v1/test_node.py rename to magnum/tests/unit/api/controllers/v1/test_node.py index ea7e0fbe54..84bb3a4557 100644 --- a/magnum/tests/api/controllers/v1/test_node.py +++ b/magnum/tests/unit/api/controllers/v1/test_node.py @@ -20,10 +20,10 @@ from wsme import types as wtypes from magnum.api.controllers.v1 import node as api_node from magnum.common import utils -from magnum.tests.api import base as api_base -from magnum.tests.api import utils as apiutils from magnum.tests import base -from magnum.tests.objects import utils as obj_utils +from magnum.tests.unit.api import base as api_base +from magnum.tests.unit.api import utils as apiutils +from magnum.tests.unit.objects import utils as obj_utils class TestNodeObject(base.TestCase): diff --git a/magnum/tests/api/controllers/v1/test_pod.py b/magnum/tests/unit/api/controllers/v1/test_pod.py similarity index 99% rename from magnum/tests/api/controllers/v1/test_pod.py rename to magnum/tests/unit/api/controllers/v1/test_pod.py index ff4a3909b9..7fd2c1195b 100644 --- a/magnum/tests/api/controllers/v1/test_pod.py +++ b/magnum/tests/unit/api/controllers/v1/test_pod.py @@ -22,10 +22,10 @@ from magnum.api.controllers.v1 import pod as api_pod from magnum.common import utils from magnum.conductor import api as rpcapi from magnum import objects -from magnum.tests.api import base as api_base -from magnum.tests.api import utils as apiutils from magnum.tests import base -from magnum.tests.objects import utils as obj_utils +from magnum.tests.unit.api import base as api_base +from magnum.tests.unit.api import utils as apiutils +from magnum.tests.unit.objects import utils as obj_utils class TestPodObject(base.TestCase): diff --git a/magnum/tests/api/controllers/v1/test_replicationcontroller.py b/magnum/tests/unit/api/controllers/v1/test_replicationcontroller.py similarity index 99% rename from magnum/tests/api/controllers/v1/test_replicationcontroller.py rename to magnum/tests/unit/api/controllers/v1/test_replicationcontroller.py index 3f1ad4c7ac..4077929fe1 100644 --- a/magnum/tests/api/controllers/v1/test_replicationcontroller.py +++ b/magnum/tests/unit/api/controllers/v1/test_replicationcontroller.py @@ -22,10 +22,10 @@ from magnum.api.controllers.v1 import replicationcontroller as api_rc from magnum.common import utils from magnum.conductor import api as rpcapi from magnum import objects -from magnum.tests.api import base as api_base -from magnum.tests.api import utils as apiutils from magnum.tests import base -from magnum.tests.objects import utils as obj_utils +from magnum.tests.unit.api import base as api_base +from magnum.tests.unit.api import utils as apiutils +from magnum.tests.unit.objects import utils as obj_utils class TestRCObject(base.TestCase): diff --git a/magnum/tests/api/controllers/v1/test_service.py b/magnum/tests/unit/api/controllers/v1/test_service.py similarity index 99% rename from magnum/tests/api/controllers/v1/test_service.py rename to magnum/tests/unit/api/controllers/v1/test_service.py index d9a1df9b4c..9cf30c00ad 100644 --- a/magnum/tests/api/controllers/v1/test_service.py +++ b/magnum/tests/unit/api/controllers/v1/test_service.py @@ -22,10 +22,10 @@ from magnum.api.controllers.v1 import service as api_service from magnum.common import utils from magnum.conductor import api as rpcapi from magnum import objects -from magnum.tests.api import base as api_base -from magnum.tests.api import utils as apiutils from magnum.tests import base -from magnum.tests.objects import utils as obj_utils +from magnum.tests.unit.api import base as api_base +from magnum.tests.unit.api import utils as apiutils +from magnum.tests.unit.objects import utils as obj_utils class TestServiceObject(base.TestCase): diff --git a/magnum/tests/api/controllers/v1/test_types.py b/magnum/tests/unit/api/controllers/v1/test_types.py similarity index 99% rename from magnum/tests/api/controllers/v1/test_types.py rename to magnum/tests/unit/api/controllers/v1/test_types.py index e045f0c41f..6caff6016e 100644 --- a/magnum/tests/api/controllers/v1/test_types.py +++ b/magnum/tests/unit/api/controllers/v1/test_types.py @@ -23,7 +23,7 @@ import wsme from magnum.api.controllers.v1 import types from magnum.common import exception from magnum.common import utils -from magnum.tests.api import base +from magnum.tests.unit.api import base class TestMacAddressType(base.FunctionalTest): diff --git a/magnum/tests/api/controllers/v1/test_utils.py b/magnum/tests/unit/api/controllers/v1/test_utils.py similarity index 97% rename from magnum/tests/api/controllers/v1/test_utils.py rename to magnum/tests/unit/api/controllers/v1/test_utils.py index 029a95c3bc..dbf98e327b 100644 --- a/magnum/tests/api/controllers/v1/test_utils.py +++ b/magnum/tests/unit/api/controllers/v1/test_utils.py @@ -16,7 +16,7 @@ import wsme from magnum.api.controllers.v1 import utils -from magnum.tests.api import base +from magnum.tests.unit.api import base from oslo_config import cfg diff --git a/magnum/tests/api/test_app.py b/magnum/tests/unit/api/test_app.py similarity index 100% rename from magnum/tests/api/test_app.py rename to magnum/tests/unit/api/test_app.py diff --git a/magnum/tests/api/test_auth.py b/magnum/tests/unit/api/test_auth.py similarity index 100% rename from magnum/tests/api/test_auth.py rename to magnum/tests/unit/api/test_auth.py diff --git a/magnum/tests/api/test_hooks.py b/magnum/tests/unit/api/test_hooks.py similarity index 99% rename from magnum/tests/api/test_hooks.py rename to magnum/tests/unit/api/test_hooks.py index 58f600c296..2bec645103 100644 --- a/magnum/tests/api/test_hooks.py +++ b/magnum/tests/unit/api/test_hooks.py @@ -22,9 +22,9 @@ import oslo_messaging as messaging from magnum.api.controllers import root from magnum.api import hooks from magnum.common import context as magnum_context -from magnum.tests.api import base as api_base from magnum.tests import base from magnum.tests import fakes +from magnum.tests.unit.api import base as api_base class TestContextHook(base.BaseTestCase): diff --git a/magnum/tests/api/utils.py b/magnum/tests/unit/api/utils.py similarity index 98% rename from magnum/tests/api/utils.py rename to magnum/tests/unit/api/utils.py index 4fe51ed665..179b4a3ede 100644 --- a/magnum/tests/api/utils.py +++ b/magnum/tests/unit/api/utils.py @@ -19,7 +19,7 @@ from magnum.api.controllers.v1 import node as node_controller from magnum.api.controllers.v1 import pod as pod_controller from magnum.api.controllers.v1 import replicationcontroller as rc_controller from magnum.api.controllers.v1 import service as service_controller -from magnum.tests.db import utils +from magnum.tests.unit.db import utils def remove_internal(values, internal): diff --git a/magnum/tests/conductor/__init__.py b/magnum/tests/unit/common/__init__.py similarity index 100% rename from magnum/tests/conductor/__init__.py rename to magnum/tests/unit/common/__init__.py diff --git a/magnum/tests/common/test_clients.py b/magnum/tests/unit/common/test_clients.py similarity index 100% rename from magnum/tests/common/test_clients.py rename to magnum/tests/unit/common/test_clients.py diff --git a/magnum/tests/common/test_context.py b/magnum/tests/unit/common/test_context.py similarity index 100% rename from magnum/tests/common/test_context.py rename to magnum/tests/unit/common/test_context.py diff --git a/magnum/tests/common/test_exception.py b/magnum/tests/unit/common/test_exception.py similarity index 100% rename from magnum/tests/common/test_exception.py rename to magnum/tests/unit/common/test_exception.py diff --git a/magnum/tests/common/test_k8s_manifest.py b/magnum/tests/unit/common/test_k8s_manifest.py similarity index 100% rename from magnum/tests/common/test_k8s_manifest.py rename to magnum/tests/unit/common/test_k8s_manifest.py diff --git a/magnum/tests/common/test_magnum_keystoneclient.py b/magnum/tests/unit/common/test_magnum_keystoneclient.py similarity index 100% rename from magnum/tests/common/test_magnum_keystoneclient.py rename to magnum/tests/unit/common/test_magnum_keystoneclient.py diff --git a/magnum/tests/common/test_safeutils.py b/magnum/tests/unit/common/test_safeutils.py similarity index 100% rename from magnum/tests/common/test_safeutils.py rename to magnum/tests/unit/common/test_safeutils.py diff --git a/magnum/tests/common/test_short_id.py b/magnum/tests/unit/common/test_short_id.py similarity index 100% rename from magnum/tests/common/test_short_id.py rename to magnum/tests/unit/common/test_short_id.py diff --git a/magnum/tests/common/test_urlfetch.py b/magnum/tests/unit/common/test_urlfetch.py similarity index 100% rename from magnum/tests/common/test_urlfetch.py rename to magnum/tests/unit/common/test_urlfetch.py diff --git a/magnum/tests/common/test_utils.py b/magnum/tests/unit/common/test_utils.py similarity index 100% rename from magnum/tests/common/test_utils.py rename to magnum/tests/unit/common/test_utils.py diff --git a/magnum/tests/common/test_yamlutils.py b/magnum/tests/unit/common/test_yamlutils.py similarity index 100% rename from magnum/tests/common/test_yamlutils.py rename to magnum/tests/unit/common/test_yamlutils.py diff --git a/magnum/tests/conductor/handlers/__init__.py b/magnum/tests/unit/conductor/__init__.py similarity index 100% rename from magnum/tests/conductor/handlers/__init__.py rename to magnum/tests/unit/conductor/__init__.py diff --git a/magnum/tests/conductor/handlers/common/__init__.py b/magnum/tests/unit/conductor/handlers/__init__.py similarity index 100% rename from magnum/tests/conductor/handlers/common/__init__.py rename to magnum/tests/unit/conductor/handlers/__init__.py diff --git a/magnum/tests/conductor/tasks/__init__.py b/magnum/tests/unit/conductor/handlers/common/__init__.py similarity index 100% rename from magnum/tests/conductor/tasks/__init__.py rename to magnum/tests/unit/conductor/handlers/common/__init__.py diff --git a/magnum/tests/conductor/handlers/common/test_kube_utils.py b/magnum/tests/unit/conductor/handlers/common/test_kube_utils.py similarity index 100% rename from magnum/tests/conductor/handlers/common/test_kube_utils.py rename to magnum/tests/unit/conductor/handlers/common/test_kube_utils.py diff --git a/magnum/tests/conductor/handlers/test_bay_k8s_heat.py b/magnum/tests/unit/conductor/handlers/test_bay_k8s_heat.py similarity index 99% rename from magnum/tests/conductor/handlers/test_bay_k8s_heat.py rename to magnum/tests/unit/conductor/handlers/test_bay_k8s_heat.py index f3697d6956..c80d83b8ef 100644 --- a/magnum/tests/conductor/handlers/test_bay_k8s_heat.py +++ b/magnum/tests/unit/conductor/handlers/test_bay_k8s_heat.py @@ -19,8 +19,8 @@ from magnum.conductor.handlers import bay_k8s_heat from magnum import objects from magnum.openstack.common import loopingcall from magnum.tests import base -from magnum.tests.db import base as db_base -from magnum.tests.db import utils +from magnum.tests.unit.db import base as db_base +from magnum.tests.unit.db import utils import mock from mock import patch diff --git a/magnum/tests/conductor/handlers/test_docker_conductor.py b/magnum/tests/unit/conductor/handlers/test_docker_conductor.py similarity index 100% rename from magnum/tests/conductor/handlers/test_docker_conductor.py rename to magnum/tests/unit/conductor/handlers/test_docker_conductor.py diff --git a/magnum/tests/conductor/handlers/test_kube.py b/magnum/tests/unit/conductor/handlers/test_kube.py similarity index 100% rename from magnum/tests/conductor/handlers/test_kube.py rename to magnum/tests/unit/conductor/handlers/test_kube.py diff --git a/magnum/tests/db/__init__.py b/magnum/tests/unit/conductor/tasks/__init__.py similarity index 100% rename from magnum/tests/db/__init__.py rename to magnum/tests/unit/conductor/tasks/__init__.py diff --git a/magnum/tests/conductor/tasks/test_heat_tasks.py b/magnum/tests/unit/conductor/tasks/test_heat_tasks.py similarity index 100% rename from magnum/tests/conductor/tasks/test_heat_tasks.py rename to magnum/tests/unit/conductor/tasks/test_heat_tasks.py diff --git a/magnum/tests/conductor/test_rpcapi.py b/magnum/tests/unit/conductor/test_rpcapi.py similarity index 98% rename from magnum/tests/conductor/test_rpcapi.py rename to magnum/tests/unit/conductor/test_rpcapi.py index 310358a81f..1b966deb52 100644 --- a/magnum/tests/conductor/test_rpcapi.py +++ b/magnum/tests/unit/conductor/test_rpcapi.py @@ -18,8 +18,8 @@ import copy import mock from magnum.conductor import api as conductor_rpcapi -from magnum.tests.db import base -from magnum.tests.db import utils as dbutils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils as dbutils class RPCAPITestCase(base.DbTestCase): diff --git a/magnum/tests/db/sqlalchemy/__init__.py b/magnum/tests/unit/db/__init__.py similarity index 100% rename from magnum/tests/db/sqlalchemy/__init__.py rename to magnum/tests/unit/db/__init__.py diff --git a/magnum/tests/db/base.py b/magnum/tests/unit/db/base.py similarity index 100% rename from magnum/tests/db/base.py rename to magnum/tests/unit/db/base.py diff --git a/magnum/tests/objects/__init__.py b/magnum/tests/unit/db/sqlalchemy/__init__.py similarity index 100% rename from magnum/tests/objects/__init__.py rename to magnum/tests/unit/db/sqlalchemy/__init__.py diff --git a/magnum/tests/db/sqlalchemy/test_types.py b/magnum/tests/unit/db/sqlalchemy/test_types.py similarity index 98% rename from magnum/tests/db/sqlalchemy/test_types.py rename to magnum/tests/unit/db/sqlalchemy/test_types.py index 193154a849..12c87e8b0f 100644 --- a/magnum/tests/db/sqlalchemy/test_types.py +++ b/magnum/tests/unit/db/sqlalchemy/test_types.py @@ -18,7 +18,7 @@ from magnum.common import utils as magnum_utils from magnum.db import api as dbapi import magnum.db.sqlalchemy.api as sa_api from magnum.db.sqlalchemy import models -from magnum.tests.db import base +from magnum.tests.unit.db import base class SqlAlchemyCustomTypesTestCase(base.DbTestCase): diff --git a/magnum/tests/db/test_bay.py b/magnum/tests/unit/db/test_bay.py similarity index 98% rename from magnum/tests/db/test_bay.py rename to magnum/tests/unit/db/test_bay.py index b2497dc596..f3545aa568 100644 --- a/magnum/tests/db/test_bay.py +++ b/magnum/tests/unit/db/test_bay.py @@ -19,8 +19,8 @@ import six from magnum.common import exception from magnum.common import utils as magnum_utils -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class DbBayTestCase(base.DbTestCase): diff --git a/magnum/tests/db/test_baymodel.py b/magnum/tests/unit/db/test_baymodel.py similarity index 98% rename from magnum/tests/db/test_baymodel.py rename to magnum/tests/unit/db/test_baymodel.py index 7616d24d19..ac9a916bf2 100644 --- a/magnum/tests/db/test_baymodel.py +++ b/magnum/tests/unit/db/test_baymodel.py @@ -19,8 +19,8 @@ import six from magnum.common import exception from magnum.common import utils as magnum_utils -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class DbBaymodelTestCase(base.DbTestCase): diff --git a/magnum/tests/db/test_container.py b/magnum/tests/unit/db/test_container.py similarity index 98% rename from magnum/tests/db/test_container.py rename to magnum/tests/unit/db/test_container.py index 05e946b042..551f69ebd7 100644 --- a/magnum/tests/db/test_container.py +++ b/magnum/tests/unit/db/test_container.py @@ -19,8 +19,8 @@ import six from magnum.common import exception from magnum.common import utils as magnum_utils -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class DbContainerTestCase(base.DbTestCase): diff --git a/magnum/tests/db/test_node.py b/magnum/tests/unit/db/test_node.py similarity index 98% rename from magnum/tests/db/test_node.py rename to magnum/tests/unit/db/test_node.py index 66ff375e94..9b582c632a 100644 --- a/magnum/tests/db/test_node.py +++ b/magnum/tests/unit/db/test_node.py @@ -19,8 +19,8 @@ import six from magnum.common import exception from magnum.common import utils as magnum_utils -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class DbNodeTestCase(base.DbTestCase): diff --git a/magnum/tests/db/test_pod.py b/magnum/tests/unit/db/test_pod.py similarity index 98% rename from magnum/tests/db/test_pod.py rename to magnum/tests/unit/db/test_pod.py index 6e9633b9b1..bf178f764d 100644 --- a/magnum/tests/db/test_pod.py +++ b/magnum/tests/unit/db/test_pod.py @@ -19,8 +19,8 @@ import six from magnum.common import exception from magnum.common import utils as magnum_utils -from magnum.tests.db import base -from magnum.tests.db import utils as utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils as utils class DbPodTestCase(base.DbTestCase): diff --git a/magnum/tests/db/test_replicationcontroller.py b/magnum/tests/unit/db/test_replicationcontroller.py similarity index 98% rename from magnum/tests/db/test_replicationcontroller.py rename to magnum/tests/unit/db/test_replicationcontroller.py index b5fccfb0e6..40c062bc4e 100644 --- a/magnum/tests/db/test_replicationcontroller.py +++ b/magnum/tests/unit/db/test_replicationcontroller.py @@ -19,8 +19,8 @@ import six from magnum.common import exception from magnum.common import utils as magnum_utils -from magnum.tests.db import base -from magnum.tests.db import utils as utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils as utils class DbRCTestCase(base.DbTestCase): diff --git a/magnum/tests/db/test_service.py b/magnum/tests/unit/db/test_service.py similarity index 98% rename from magnum/tests/db/test_service.py rename to magnum/tests/unit/db/test_service.py index 06068c42da..8d71fd4f64 100644 --- a/magnum/tests/db/test_service.py +++ b/magnum/tests/unit/db/test_service.py @@ -19,8 +19,8 @@ import six from magnum.common import exception from magnum.common import utils as magnum_utils -from magnum.tests.db import base -from magnum.tests.db import utils as utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils as utils class DbServiceTestCase(base.DbTestCase): diff --git a/magnum/tests/db/utils.py b/magnum/tests/unit/db/utils.py similarity index 100% rename from magnum/tests/db/utils.py rename to magnum/tests/unit/db/utils.py diff --git a/magnum/tests/unit/objects/__init__.py b/magnum/tests/unit/objects/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/magnum/tests/objects/test_bay.py b/magnum/tests/unit/objects/test_bay.py similarity index 98% rename from magnum/tests/objects/test_bay.py rename to magnum/tests/unit/objects/test_bay.py index b3f2c13046..2b1af1aa87 100644 --- a/magnum/tests/objects/test_bay.py +++ b/magnum/tests/unit/objects/test_bay.py @@ -19,8 +19,8 @@ from testtools.matchers import HasLength from magnum.common import exception from magnum.common import utils as magnum_utils from magnum import objects -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class TestBayObject(base.DbTestCase): diff --git a/magnum/tests/objects/test_baymodel.py b/magnum/tests/unit/objects/test_baymodel.py similarity index 98% rename from magnum/tests/objects/test_baymodel.py rename to magnum/tests/unit/objects/test_baymodel.py index a87a9caee5..7468723f91 100644 --- a/magnum/tests/objects/test_baymodel.py +++ b/magnum/tests/unit/objects/test_baymodel.py @@ -19,8 +19,8 @@ from testtools.matchers import HasLength from magnum.common import exception from magnum.common import utils as magnum_utils from magnum import objects -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class TestBayModelObject(base.DbTestCase): diff --git a/magnum/tests/objects/test_container.py b/magnum/tests/unit/objects/test_container.py similarity index 98% rename from magnum/tests/objects/test_container.py rename to magnum/tests/unit/objects/test_container.py index 2b932d9a00..5d662bceb3 100644 --- a/magnum/tests/objects/test_container.py +++ b/magnum/tests/unit/objects/test_container.py @@ -18,8 +18,8 @@ from testtools.matchers import HasLength from magnum.common import utils as magnum_utils from magnum import objects -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class TestContainerObject(base.DbTestCase): diff --git a/magnum/tests/objects/test_node.py b/magnum/tests/unit/objects/test_node.py similarity index 98% rename from magnum/tests/objects/test_node.py rename to magnum/tests/unit/objects/test_node.py index 9a387c2736..fa02fd612d 100644 --- a/magnum/tests/objects/test_node.py +++ b/magnum/tests/unit/objects/test_node.py @@ -18,8 +18,8 @@ from testtools.matchers import HasLength from magnum.common import utils as magnum_utils from magnum import objects -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class TestNodeObject(base.DbTestCase): diff --git a/magnum/tests/objects/test_objects.py b/magnum/tests/unit/objects/test_objects.py similarity index 100% rename from magnum/tests/objects/test_objects.py rename to magnum/tests/unit/objects/test_objects.py diff --git a/magnum/tests/objects/test_objects_sqlalchemy.py b/magnum/tests/unit/objects/test_objects_sqlalchemy.py similarity index 100% rename from magnum/tests/objects/test_objects_sqlalchemy.py rename to magnum/tests/unit/objects/test_objects_sqlalchemy.py diff --git a/magnum/tests/objects/test_pod.py b/magnum/tests/unit/objects/test_pod.py similarity index 98% rename from magnum/tests/objects/test_pod.py rename to magnum/tests/unit/objects/test_pod.py index b9081d514d..019326abc5 100644 --- a/magnum/tests/objects/test_pod.py +++ b/magnum/tests/unit/objects/test_pod.py @@ -18,8 +18,8 @@ from testtools.matchers import HasLength from magnum.common import utils as magnum_utils from magnum import objects -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class TestPodObject(base.DbTestCase): diff --git a/magnum/tests/objects/test_replicationcontroller.py b/magnum/tests/unit/objects/test_replicationcontroller.py similarity index 98% rename from magnum/tests/objects/test_replicationcontroller.py rename to magnum/tests/unit/objects/test_replicationcontroller.py index 3b53315556..40f73f8a05 100644 --- a/magnum/tests/objects/test_replicationcontroller.py +++ b/magnum/tests/unit/objects/test_replicationcontroller.py @@ -18,8 +18,8 @@ from testtools.matchers import HasLength from magnum.common import utils as magnum_utils from magnum import objects -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class TestReplicationControllerObject(base.DbTestCase): diff --git a/magnum/tests/objects/test_service.py b/magnum/tests/unit/objects/test_service.py similarity index 98% rename from magnum/tests/objects/test_service.py rename to magnum/tests/unit/objects/test_service.py index 77aa11a8c8..9d05687b8f 100644 --- a/magnum/tests/objects/test_service.py +++ b/magnum/tests/unit/objects/test_service.py @@ -18,8 +18,8 @@ from testtools.matchers import HasLength from magnum.common import utils as magnum_utils from magnum import objects -from magnum.tests.db import base -from magnum.tests.db import utils +from magnum.tests.unit.db import base +from magnum.tests.unit.db import utils class TestServiceObject(base.DbTestCase): diff --git a/magnum/tests/objects/utils.py b/magnum/tests/unit/objects/utils.py similarity index 99% rename from magnum/tests/objects/utils.py rename to magnum/tests/unit/objects/utils.py index dd3f4188ab..911b5c0dbd 100644 --- a/magnum/tests/objects/utils.py +++ b/magnum/tests/unit/objects/utils.py @@ -15,7 +15,7 @@ """Magnum object test utilities.""" from magnum import objects -from magnum.tests.db import utils as db_utils +from magnum.tests.unit.db import utils as db_utils def get_test_baymodel(context, **kw):