From bdd2d6a6293b1966b10344f1c37f501d011b75d5 Mon Sep 17 00:00:00 2001
From: Anastasia Kuznetsova <akuznetsova@mirantis.com>
Date: Mon, 16 Nov 2015 19:47:25 +0300
Subject: [PATCH] Move base.py and config.py under unit/ folder

base.py and config.py files are used only in unit tests, but
now they are located near unit and functional tests folder, so
it seems that they are used in functional tests too.

Change-Id: Iedefb76a065d3155065be8e2a3a11bcf4b9dc69d
---
 .../tests/unit/actions/openstack/test_ceilometer_generator.py   | 2 +-
 mistral/tests/unit/actions/openstack/test_cinder_generator.py   | 2 +-
 mistral/tests/unit/actions/openstack/test_glance_generator.py   | 2 +-
 mistral/tests/unit/actions/openstack/test_heat_generator.py     | 2 +-
 mistral/tests/unit/actions/openstack/test_keystone_generator.py | 2 +-
 mistral/tests/unit/actions/openstack/test_neutron_generator.py  | 2 +-
 mistral/tests/unit/actions/openstack/test_nova_generator.py     | 2 +-
 mistral/tests/unit/actions/test_action_manager.py               | 2 +-
 mistral/tests/unit/actions/test_javascript_action.py            | 2 +-
 mistral/tests/unit/actions/test_std_echo_action.py              | 2 +-
 mistral/tests/unit/actions/test_std_email_action.py             | 2 +-
 mistral/tests/unit/actions/test_std_fail_action.py              | 2 +-
 mistral/tests/unit/actions/test_std_http_action.py              | 2 +-
 mistral/tests/unit/api/base.py                                  | 2 +-
 mistral/tests/{ => unit}/base.py                                | 2 +-
 mistral/tests/{ => unit}/config.py                              | 0
 mistral/tests/unit/db/v2/test_locking.py                        | 2 +-
 mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py              | 2 +-
 mistral/tests/unit/db/v2/test_sqlite_transactions.py            | 2 +-
 mistral/tests/unit/engine/base.py                               | 2 +-
 mistral/tests/unit/engine/test_action_context.py                | 2 +-
 mistral/tests/unit/engine/test_action_defaults.py               | 2 +-
 mistral/tests/unit/engine/test_dataflow.py                      | 2 +-
 mistral/tests/unit/engine/test_default_engine.py                | 2 +-
 mistral/tests/unit/engine/test_error_result.py                  | 2 +-
 .../tests/unit/engine/test_execution_fields_size_limitation.py  | 2 +-
 mistral/tests/unit/engine/test_race_condition.py                | 2 +-
 mistral/tests/unit/engine/test_with_items.py                    | 2 +-
 mistral/tests/unit/services/test_action_manager.py              | 2 +-
 mistral/tests/unit/services/test_action_service.py              | 2 +-
 mistral/tests/unit/services/test_scheduler.py                   | 2 +-
 mistral/tests/unit/services/test_trigger_service.py             | 2 +-
 mistral/tests/unit/services/test_workbook_service.py            | 2 +-
 mistral/tests/unit/services/test_workflow_service.py            | 2 +-
 mistral/tests/unit/test_coordination.py                         | 2 +-
 mistral/tests/unit/test_exception_base.py                       | 2 +-
 mistral/tests/unit/test_expressions.py                          | 2 +-
 mistral/tests/unit/utils/test_inspect_utils.py                  | 2 +-
 mistral/tests/unit/utils/test_keystone_utils.py                 | 2 +-
 mistral/tests/unit/utils/test_utils.py                          | 2 +-
 mistral/tests/unit/workbook/v2/base.py                          | 2 +-
 mistral/tests/unit/workflow/test_base.py                        | 2 +-
 mistral/tests/unit/workflow/test_direct_workflow.py             | 2 +-
 mistral/tests/unit/workflow/test_reverse_workflow.py            | 2 +-
 mistral/tests/unit/workflow/test_states.py                      | 2 +-
 mistral/tests/unit/workflow/test_with_items.py                  | 2 +-
 46 files changed, 45 insertions(+), 45 deletions(-)
 rename mistral/tests/{ => unit}/base.py (99%)
 rename mistral/tests/{ => unit}/config.py (100%)

diff --git a/mistral/tests/unit/actions/openstack/test_ceilometer_generator.py b/mistral/tests/unit/actions/openstack/test_ceilometer_generator.py
index d4c7f1491..bd0cb1614 100644
--- a/mistral/tests/unit/actions/openstack/test_ceilometer_generator.py
+++ b/mistral/tests/unit/actions/openstack/test_ceilometer_generator.py
@@ -14,7 +14,7 @@
 
 from mistral.actions.openstack.action_generator import generators
 from mistral.actions.openstack import actions
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class CeilometerGeneratorTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/openstack/test_cinder_generator.py b/mistral/tests/unit/actions/openstack/test_cinder_generator.py
index 58e92dfc0..82dfd0d41 100644
--- a/mistral/tests/unit/actions/openstack/test_cinder_generator.py
+++ b/mistral/tests/unit/actions/openstack/test_cinder_generator.py
@@ -14,7 +14,7 @@
 
 from mistral.actions.openstack.action_generator import generators
 from mistral.actions.openstack import actions
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class CinderGeneratorTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/openstack/test_glance_generator.py b/mistral/tests/unit/actions/openstack/test_glance_generator.py
index 3881007a3..ab8c085ba 100644
--- a/mistral/tests/unit/actions/openstack/test_glance_generator.py
+++ b/mistral/tests/unit/actions/openstack/test_glance_generator.py
@@ -14,7 +14,7 @@
 
 from mistral.actions.openstack.action_generator import generators
 from mistral.actions.openstack import actions
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class GlanceGeneratorTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/openstack/test_heat_generator.py b/mistral/tests/unit/actions/openstack/test_heat_generator.py
index cb1706491..b1c8dd674 100644
--- a/mistral/tests/unit/actions/openstack/test_heat_generator.py
+++ b/mistral/tests/unit/actions/openstack/test_heat_generator.py
@@ -14,7 +14,7 @@
 
 from mistral.actions.openstack.action_generator import generators
 from mistral.actions.openstack import actions
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class HeatGeneratorTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/openstack/test_keystone_generator.py b/mistral/tests/unit/actions/openstack/test_keystone_generator.py
index ff0636f37..1462300f2 100644
--- a/mistral/tests/unit/actions/openstack/test_keystone_generator.py
+++ b/mistral/tests/unit/actions/openstack/test_keystone_generator.py
@@ -14,7 +14,7 @@
 
 from mistral.actions.openstack.action_generator import generators
 from mistral.actions.openstack import actions
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class KeystoneGeneratorTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/openstack/test_neutron_generator.py b/mistral/tests/unit/actions/openstack/test_neutron_generator.py
index 43017379d..ac49c7e9b 100644
--- a/mistral/tests/unit/actions/openstack/test_neutron_generator.py
+++ b/mistral/tests/unit/actions/openstack/test_neutron_generator.py
@@ -14,7 +14,7 @@
 
 from mistral.actions.openstack.action_generator import generators
 from mistral.actions.openstack import actions
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class NeutronGeneratorTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/openstack/test_nova_generator.py b/mistral/tests/unit/actions/openstack/test_nova_generator.py
index 6e8c51b6c..7dd90d6d9 100644
--- a/mistral/tests/unit/actions/openstack/test_nova_generator.py
+++ b/mistral/tests/unit/actions/openstack/test_nova_generator.py
@@ -14,7 +14,7 @@
 
 from mistral.actions.openstack.action_generator import generators
 from mistral.actions.openstack import actions
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class NovaGeneratorTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/test_action_manager.py b/mistral/tests/unit/actions/test_action_manager.py
index 520f73023..cc0bcc3e9 100644
--- a/mistral/tests/unit/actions/test_action_manager.py
+++ b/mistral/tests/unit/actions/test_action_manager.py
@@ -18,7 +18,7 @@ from oslo_log import log as logging
 
 from mistral.actions import std_actions as std
 from mistral.services import action_manager as a_m
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 LOG = logging.getLogger(__name__)
diff --git a/mistral/tests/unit/actions/test_javascript_action.py b/mistral/tests/unit/actions/test_javascript_action.py
index a8d920473..bf8153517 100644
--- a/mistral/tests/unit/actions/test_javascript_action.py
+++ b/mistral/tests/unit/actions/test_javascript_action.py
@@ -15,7 +15,7 @@
 import mock
 
 from mistral.actions import std_actions as std
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.utils import javascript
 
 
diff --git a/mistral/tests/unit/actions/test_std_echo_action.py b/mistral/tests/unit/actions/test_std_echo_action.py
index bcc6ebd59..b5c728129 100644
--- a/mistral/tests/unit/actions/test_std_echo_action.py
+++ b/mistral/tests/unit/actions/test_std_echo_action.py
@@ -15,7 +15,7 @@
 #    limitations under the License.
 
 from mistral.actions import std_actions as std
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class EchoActionTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/test_std_email_action.py b/mistral/tests/unit/actions/test_std_email_action.py
index ca1a18547..31a4c3d49 100644
--- a/mistral/tests/unit/actions/test_std_email_action.py
+++ b/mistral/tests/unit/actions/test_std_email_action.py
@@ -23,7 +23,7 @@ import testtools
 
 from mistral.actions import std_actions as std
 from mistral import exceptions as exc
-from mistral.tests import base
+from mistral.tests.unit import base
 
 """
 To try against a real SMTP server:
diff --git a/mistral/tests/unit/actions/test_std_fail_action.py b/mistral/tests/unit/actions/test_std_fail_action.py
index 7f0414d95..a7339c9e2 100644
--- a/mistral/tests/unit/actions/test_std_fail_action.py
+++ b/mistral/tests/unit/actions/test_std_fail_action.py
@@ -16,7 +16,7 @@
 
 from mistral.actions import std_actions as std
 from mistral import exceptions as exc
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class FailActionTest(base.BaseTest):
diff --git a/mistral/tests/unit/actions/test_std_http_action.py b/mistral/tests/unit/actions/test_std_http_action.py
index ee40aec3b..91de7dac0 100644
--- a/mistral/tests/unit/actions/test_std_http_action.py
+++ b/mistral/tests/unit/actions/test_std_http_action.py
@@ -20,7 +20,7 @@ import mock
 import requests
 
 from mistral.actions import std_actions as std
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workflow import utils as wf_utils
 
 
diff --git a/mistral/tests/unit/api/base.py b/mistral/tests/unit/api/base.py
index 0509758c4..7a70fe96a 100644
--- a/mistral/tests/unit/api/base.py
+++ b/mistral/tests/unit/api/base.py
@@ -20,7 +20,7 @@ import pecan
 import pecan.testing
 from webtest import app as webtest_app
 
-from mistral.tests import base
+from mistral.tests.unit import base
 
 # Disable authentication for functional tests.
 cfg.CONF.set_default('auth_enable', False, group='pecan')
diff --git a/mistral/tests/base.py b/mistral/tests/unit/base.py
similarity index 99%
rename from mistral/tests/base.py
rename to mistral/tests/unit/base.py
index dbef06ea3..4ac050aa8 100644
--- a/mistral/tests/base.py
+++ b/mistral/tests/unit/base.py
@@ -32,7 +32,7 @@ from mistral.db.sqlalchemy import sqlite_lock
 from mistral.db.v2 import api as db_api_v2
 from mistral.services import action_manager
 from mistral.services import security
-from mistral.tests import config as test_config
+from mistral.tests.unit import config as test_config
 from mistral.utils import inspect_utils as i_utils
 from mistral import version
 
diff --git a/mistral/tests/config.py b/mistral/tests/unit/config.py
similarity index 100%
rename from mistral/tests/config.py
rename to mistral/tests/unit/config.py
diff --git a/mistral/tests/unit/db/v2/test_locking.py b/mistral/tests/unit/db/v2/test_locking.py
index deec91cde..6b0ddc2da 100644
--- a/mistral/tests/unit/db/v2/test_locking.py
+++ b/mistral/tests/unit/db/v2/test_locking.py
@@ -22,7 +22,7 @@ import testtools
 from mistral.db.sqlalchemy import sqlite_lock
 from mistral.db.v2.sqlalchemy import api as db_api
 from mistral.db.v2.sqlalchemy import models as db_models
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 
 
 WF_EXEC = {
diff --git a/mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py b/mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py
index c460d7620..d6e2fbf65 100644
--- a/mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py
+++ b/mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py
@@ -25,7 +25,7 @@ from mistral.db.v2.sqlalchemy import api as db_api
 from mistral.db.v2.sqlalchemy import models as db_models
 from mistral import exceptions as exc
 from mistral.services import security
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 
 
 WORKBOOKS = [
diff --git a/mistral/tests/unit/db/v2/test_sqlite_transactions.py b/mistral/tests/unit/db/v2/test_sqlite_transactions.py
index a4747f537..554f3a337 100644
--- a/mistral/tests/unit/db/v2/test_sqlite_transactions.py
+++ b/mistral/tests/unit/db/v2/test_sqlite_transactions.py
@@ -20,7 +20,7 @@ from oslo_config import cfg
 import testtools
 
 from mistral.db.v2.sqlalchemy import api as db_api
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 
 
 WF_EXEC = {
diff --git a/mistral/tests/unit/engine/base.py b/mistral/tests/unit/engine/base.py
index 1151b683f..3b849e03f 100644
--- a/mistral/tests/unit/engine/base.py
+++ b/mistral/tests/unit/engine/base.py
@@ -24,7 +24,7 @@ from mistral.engine import default_engine as def_eng
 from mistral.engine import default_executor as def_exec
 from mistral.engine import rpc
 from mistral.services import scheduler
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workflow import states
 
 LOG = logging.getLogger(__name__)
diff --git a/mistral/tests/unit/engine/test_action_context.py b/mistral/tests/unit/engine/test_action_context.py
index 91c60ff86..b50497737 100644
--- a/mistral/tests/unit/engine/test_action_context.py
+++ b/mistral/tests/unit/engine/test_action_context.py
@@ -20,7 +20,7 @@ import requests
 from mistral.actions import std_actions
 from mistral.db.v2 import api as db_api
 from mistral.services import workbooks as wb_service
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 from mistral.tests.unit.engine import base
 from mistral.workflow import states
 
diff --git a/mistral/tests/unit/engine/test_action_defaults.py b/mistral/tests/unit/engine/test_action_defaults.py
index 5dbe8998a..2fe057062 100644
--- a/mistral/tests/unit/engine/test_action_defaults.py
+++ b/mistral/tests/unit/engine/test_action_defaults.py
@@ -21,7 +21,7 @@ import testtools
 from mistral.actions import std_actions
 from mistral.db.v2 import api as db_api
 from mistral.services import workflows as wf_service
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 from mistral.tests.unit.engine import base
 from mistral.workflow import states
 
diff --git a/mistral/tests/unit/engine/test_dataflow.py b/mistral/tests/unit/engine/test_dataflow.py
index c92275e44..aeb982a19 100644
--- a/mistral/tests/unit/engine/test_dataflow.py
+++ b/mistral/tests/unit/engine/test_dataflow.py
@@ -21,7 +21,7 @@ from oslo_log import log as logging
 from mistral.db.v2 import api as db_api
 from mistral.db.v2.sqlalchemy import models
 from mistral.services import workflows as wf_service
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 from mistral.tests.unit.engine import base as engine_test_base
 from mistral.workflow import data_flow
 from mistral.workflow import states
diff --git a/mistral/tests/unit/engine/test_default_engine.py b/mistral/tests/unit/engine/test_default_engine.py
index 4bce75dc1..be25da611 100644
--- a/mistral/tests/unit/engine/test_default_engine.py
+++ b/mistral/tests/unit/engine/test_default_engine.py
@@ -26,7 +26,7 @@ from mistral.db.v2.sqlalchemy import models
 from mistral.engine import default_engine as d_eng
 from mistral import exceptions as exc
 from mistral.services import workbooks as wb_service
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.tests.unit.engine import base as eng_test_base
 from mistral.workflow import states
 from mistral.workflow import utils as wf_utils
diff --git a/mistral/tests/unit/engine/test_error_result.py b/mistral/tests/unit/engine/test_error_result.py
index aceaba9d3..4e44b9881 100644
--- a/mistral/tests/unit/engine/test_error_result.py
+++ b/mistral/tests/unit/engine/test_error_result.py
@@ -18,7 +18,7 @@ from oslo_log import log as logging
 from mistral.actions import base as actions_base
 from mistral.db.v2 import api as db_api
 from mistral.services import workflows as wf_service
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 from mistral.tests.unit.engine import base
 from mistral.workflow import data_flow
 from mistral.workflow import states
diff --git a/mistral/tests/unit/engine/test_execution_fields_size_limitation.py b/mistral/tests/unit/engine/test_execution_fields_size_limitation.py
index af1f845cd..abe00d62f 100644
--- a/mistral/tests/unit/engine/test_execution_fields_size_limitation.py
+++ b/mistral/tests/unit/engine/test_execution_fields_size_limitation.py
@@ -20,7 +20,7 @@ from mistral.actions import base as actions_base
 from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
 from mistral.services import workflows as wf_service
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 from mistral.tests.unit.engine import base
 from mistral.workflow import states
 from mistral.workflow import utils as wf_utils
diff --git a/mistral/tests/unit/engine/test_race_condition.py b/mistral/tests/unit/engine/test_race_condition.py
index e7c0c2bf8..036b2af54 100644
--- a/mistral/tests/unit/engine/test_race_condition.py
+++ b/mistral/tests/unit/engine/test_race_condition.py
@@ -21,7 +21,7 @@ import testtools
 from mistral.actions import base as action_base
 from mistral.db.v2 import api as db_api
 from mistral.services import workflows as wf_service
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 from mistral.tests.unit.engine import base
 from mistral.workflow import states
 
diff --git a/mistral/tests/unit/engine/test_with_items.py b/mistral/tests/unit/engine/test_with_items.py
index 2620b750a..6ae295166 100644
--- a/mistral/tests/unit/engine/test_with_items.py
+++ b/mistral/tests/unit/engine/test_with_items.py
@@ -21,7 +21,7 @@ from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
 from mistral.services import workbooks as wb_service
 from mistral.services import workflows as wf_service
-from mistral.tests import base as test_base
+from mistral.tests.unit import base as test_base
 from mistral.tests.unit.engine import base
 from mistral import utils
 from mistral.workflow import data_flow
diff --git a/mistral/tests/unit/services/test_action_manager.py b/mistral/tests/unit/services/test_action_manager.py
index 76bb75e6b..eceaea83c 100644
--- a/mistral/tests/unit/services/test_action_manager.py
+++ b/mistral/tests/unit/services/test_action_manager.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 from mistral.db.v2 import api as db_api
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class ActionManagerTest(base.DbTestCase):
diff --git a/mistral/tests/unit/services/test_action_service.py b/mistral/tests/unit/services/test_action_service.py
index ee61df795..4d37a5060 100644
--- a/mistral/tests/unit/services/test_action_service.py
+++ b/mistral/tests/unit/services/test_action_service.py
@@ -17,7 +17,7 @@ from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
 from mistral.services import actions as action_service
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral import utils
 from mistral.workbook import parser as spec_parser
 
diff --git a/mistral/tests/unit/services/test_scheduler.py b/mistral/tests/unit/services/test_scheduler.py
index 982de49c6..0c8b9c163 100644
--- a/mistral/tests/unit/services/test_scheduler.py
+++ b/mistral/tests/unit/services/test_scheduler.py
@@ -20,7 +20,7 @@ import mock
 from mistral.db.v2 import api as db_api
 from mistral import exceptions as exc
 from mistral.services import scheduler
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workflow import utils as wf_utils
 
 
diff --git a/mistral/tests/unit/services/test_trigger_service.py b/mistral/tests/unit/services/test_trigger_service.py
index 2b1fc45e9..95da472cb 100644
--- a/mistral/tests/unit/services/test_trigger_service.py
+++ b/mistral/tests/unit/services/test_trigger_service.py
@@ -23,7 +23,7 @@ from mistral.services import periodic
 from mistral.services import security
 from mistral.services import triggers as t_s
 from mistral.services import workflows
-from mistral.tests import base
+from mistral.tests.unit import base
 
 # Use the set_default method to set value otherwise in certain test cases
 # the change in value is not permanent.
diff --git a/mistral/tests/unit/services/test_workbook_service.py b/mistral/tests/unit/services/test_workbook_service.py
index e39e96af0..42f2b3826 100644
--- a/mistral/tests/unit/services/test_workbook_service.py
+++ b/mistral/tests/unit/services/test_workbook_service.py
@@ -17,7 +17,7 @@ from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api
 from mistral.services import workbooks as wb_service
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workbook import parser as spec_parser
 
 LOG = logging.getLogger(__name__)
diff --git a/mistral/tests/unit/services/test_workflow_service.py b/mistral/tests/unit/services/test_workflow_service.py
index 748e71570..a650b3a9e 100644
--- a/mistral/tests/unit/services/test_workflow_service.py
+++ b/mistral/tests/unit/services/test_workflow_service.py
@@ -17,7 +17,7 @@ from oslo_log import log as logging
 
 from mistral import exceptions as exc
 from mistral.services import workflows as wf_service
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral import utils
 from mistral.workbook import parser as spec_parser
 
diff --git a/mistral/tests/unit/test_coordination.py b/mistral/tests/unit/test_coordination.py
index 0b534b20f..47a5065b2 100644
--- a/mistral/tests/unit/test_coordination.py
+++ b/mistral/tests/unit/test_coordination.py
@@ -17,7 +17,7 @@ from oslo_config import cfg
 import six
 
 from mistral import coordination
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class ServiceCoordinatorTest(base.BaseTest):
diff --git a/mistral/tests/unit/test_exception_base.py b/mistral/tests/unit/test_exception_base.py
index aae5a787b..73d008edf 100644
--- a/mistral/tests/unit/test_exception_base.py
+++ b/mistral/tests/unit/test_exception_base.py
@@ -17,7 +17,7 @@
 import six
 
 from mistral import exceptions
-from mistral.tests import base
+from mistral.tests.unit import base
 
 
 class ExceptionTestCase(base.BaseTest):
diff --git a/mistral/tests/unit/test_expressions.py b/mistral/tests/unit/test_expressions.py
index 7d3bb1939..eafb1784b 100644
--- a/mistral/tests/unit/test_expressions.py
+++ b/mistral/tests/unit/test_expressions.py
@@ -15,7 +15,7 @@
 
 from mistral import exceptions as exc
 from mistral import expressions as expr
-from mistral.tests import base
+from mistral.tests.unit import base
 
 DATA = {
     "server": {
diff --git a/mistral/tests/unit/utils/test_inspect_utils.py b/mistral/tests/unit/utils/test_inspect_utils.py
index aa94a8b8c..8ee122ae4 100644
--- a/mistral/tests/unit/utils/test_inspect_utils.py
+++ b/mistral/tests/unit/utils/test_inspect_utils.py
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 from mistral.actions import std_actions
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.utils import inspect_utils as i_u
 from mistral.workflow import commands
 
diff --git a/mistral/tests/unit/utils/test_keystone_utils.py b/mistral/tests/unit/utils/test_keystone_utils.py
index 8e32b9076..28360f581 100644
--- a/mistral/tests/unit/utils/test_keystone_utils.py
+++ b/mistral/tests/unit/utils/test_keystone_utils.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.utils.openstack import keystone
 
 
diff --git a/mistral/tests/unit/utils/test_utils.py b/mistral/tests/unit/utils/test_utils.py
index d668c48d1..3f1787250 100644
--- a/mistral/tests/unit/utils/test_utils.py
+++ b/mistral/tests/unit/utils/test_utils.py
@@ -17,7 +17,7 @@
 import copy
 
 from mistral import exceptions as exc
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral import utils
 from mistral.utils import ssh_utils
 
diff --git a/mistral/tests/unit/workbook/v2/base.py b/mistral/tests/unit/workbook/v2/base.py
index 937ba04c1..eb244f5ea 100644
--- a/mistral/tests/unit/workbook/v2/base.py
+++ b/mistral/tests/unit/workbook/v2/base.py
@@ -18,7 +18,7 @@ from oslo_log import log as logging
 import yaml
 
 from mistral import exceptions as exc
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral import utils
 from mistral.workbook import parser as spec_parser
 
diff --git a/mistral/tests/unit/workflow/test_base.py b/mistral/tests/unit/workflow/test_base.py
index 60e7e24d0..e007f91e7 100644
--- a/mistral/tests/unit/workflow/test_base.py
+++ b/mistral/tests/unit/workflow/test_base.py
@@ -15,7 +15,7 @@
 import mock
 
 from mistral import exceptions
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workflow import base as wf_base
 from mistral.workflow import direct_workflow
 from mistral.workflow import reverse_workflow
diff --git a/mistral/tests/unit/workflow/test_direct_workflow.py b/mistral/tests/unit/workflow/test_direct_workflow.py
index cfd608e9f..c19d63733 100644
--- a/mistral/tests/unit/workflow/test_direct_workflow.py
+++ b/mistral/tests/unit/workflow/test_direct_workflow.py
@@ -18,7 +18,7 @@ from oslo_log import log as logging
 from mistral.db.v2 import api as db_api
 from mistral.db.v2.sqlalchemy import models
 from mistral import exceptions as exc
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workbook import parser as spec_parser
 from mistral.workflow import direct_workflow as d_wf
 from mistral.workflow import states
diff --git a/mistral/tests/unit/workflow/test_reverse_workflow.py b/mistral/tests/unit/workflow/test_reverse_workflow.py
index 4f3cae866..5643dff0e 100644
--- a/mistral/tests/unit/workflow/test_reverse_workflow.py
+++ b/mistral/tests/unit/workflow/test_reverse_workflow.py
@@ -16,7 +16,7 @@ from oslo_log import log as logging
 
 from mistral.db.v2.sqlalchemy import models
 from mistral import exceptions as exc
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workbook import parser as spec_parser
 from mistral.workflow import reverse_workflow as reverse_wf
 from mistral.workflow import states
diff --git a/mistral/tests/unit/workflow/test_states.py b/mistral/tests/unit/workflow/test_states.py
index cbb7345ac..f234f7b7c 100644
--- a/mistral/tests/unit/workflow/test_states.py
+++ b/mistral/tests/unit/workflow/test_states.py
@@ -16,7 +16,7 @@
 
 from oslo_log import log as logging
 
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workflow import states as s
 
 LOG = logging.getLogger(__name__)
diff --git a/mistral/tests/unit/workflow/test_with_items.py b/mistral/tests/unit/workflow/test_with_items.py
index 770322f21..90edfd5a0 100644
--- a/mistral/tests/unit/workflow/test_with_items.py
+++ b/mistral/tests/unit/workflow/test_with_items.py
@@ -14,7 +14,7 @@
 
 
 from mistral.db.v2.sqlalchemy import models
-from mistral.tests import base
+from mistral.tests.unit import base
 from mistral.workflow import states
 from mistral.workflow import with_items