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
This commit is contained in:
Anastasia Kuznetsova 2015-11-16 19:47:25 +03:00
parent 72d0e38368
commit bdd2d6a629
46 changed files with 45 additions and 45 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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.

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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