Merge "Move base.py and config.py under unit/ folder"

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):

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):

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):

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):

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):

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):

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):

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__)

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
 
 

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):

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:

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):

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
 
 

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')

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
 

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 = {

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 = [

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 = {

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__)

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
 

mistral/tests/unit/engine/test_action_defaults.py

@@ -22,7 +22,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
 

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

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

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

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

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
 

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

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):

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
 

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
 
 

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.

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__)

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
 

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):

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):

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": {

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
 

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
 
 

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
 

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
 

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

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

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

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__)

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