diff options
Diffstat (limited to 'heat/tests')
-rw-r--r-- | heat/tests/convergence/framework/engine_wrapper.py | 2 | ||||
-rw-r--r-- | heat/tests/convergence/framework/reality.py | 2 | ||||
-rw-r--r-- | heat/tests/db/test_migrations.py | 4 | ||||
-rw-r--r-- | heat/tests/db/test_sqlalchemy_api.py | 6 | ||||
-rw-r--r-- | heat/tests/db/test_sqlalchemy_filters.py | 2 | ||||
-rw-r--r-- | heat/tests/db/test_sqlalchemy_types.py | 2 | ||||
-rw-r--r-- | heat/tests/engine/service/test_software_config.py | 2 | ||||
-rw-r--r-- | heat/tests/engine/service/test_stack_update.py | 2 | ||||
-rw-r--r-- | heat/tests/engine/test_engine_worker.py | 2 | ||||
-rw-r--r-- | heat/tests/test_common_service_utils.py | 2 | ||||
-rw-r--r-- | heat/tests/test_engine_api_utils.py | 2 | ||||
-rw-r--r-- | heat/tests/test_event.py | 2 | ||||
-rw-r--r-- | heat/tests/test_resource.py | 4 | ||||
-rw-r--r-- | heat/tests/test_resource_properties_data.py | 2 | ||||
-rw-r--r-- | heat/tests/test_signal.py | 2 | ||||
-rw-r--r-- | heat/tests/test_stack.py | 2 | ||||
-rw-r--r-- | heat/tests/test_stack_update.py | 2 | ||||
-rw-r--r-- | heat/tests/utils.py | 4 |
18 files changed, 23 insertions, 23 deletions
diff --git a/heat/tests/convergence/framework/engine_wrapper.py b/heat/tests/convergence/framework/engine_wrapper.py index b1dc5e6b4..c1fb47c01 100644 --- a/heat/tests/convergence/framework/engine_wrapper.py +++ b/heat/tests/convergence/framework/engine_wrapper.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -from heat.db.sqlalchemy import api as db_api +from heat.db import api as db_api from heat.engine import service from heat.engine import stack from heat.tests.convergence.framework import message_processor diff --git a/heat/tests/convergence/framework/reality.py b/heat/tests/convergence/framework/reality.py index 055782b38..0618c758d 100644 --- a/heat/tests/convergence/framework/reality.py +++ b/heat/tests/convergence/framework/reality.py @@ -14,7 +14,7 @@ from unittest import mock from heat.common import exception -from heat.db.sqlalchemy import api as db_api +from heat.db import api as db_api from heat.tests import utils diff --git a/heat/tests/db/test_migrations.py b/heat/tests/db/test_migrations.py index b627e963e..ffad49f2e 100644 --- a/heat/tests/db/test_migrations.py +++ b/heat/tests/db/test_migrations.py @@ -22,8 +22,8 @@ from oslotest import base as test_base import sqlalchemy import testtools -from heat.db.sqlalchemy import migration -from heat.db.sqlalchemy import models +from heat.db import migration +from heat.db import models class DBNotAllowed(Exception): diff --git a/heat/tests/db/test_sqlalchemy_api.py b/heat/tests/db/test_sqlalchemy_api.py index 07a1c2670..a4f3309f0 100644 --- a/heat/tests/db/test_sqlalchemy_api.py +++ b/heat/tests/db/test_sqlalchemy_api.py @@ -30,8 +30,8 @@ from heat.common import context from heat.common import exception from heat.common import short_id from heat.common import template_format -from heat.db.sqlalchemy import api as db_api -from heat.db.sqlalchemy import models +from heat.db import api as db_api +from heat.db import models from heat.engine.clients.os import glance from heat.engine.clients.os import nova from heat.engine import environment @@ -2308,7 +2308,7 @@ class DBAPIStackTest(common.HeatTestCase): create_stack(self.ctx, self.template, self.user_creds, deleted_at=deleted) - with mock.patch('heat.db.sqlalchemy.api._purge_stacks') as mock_ps: + with mock.patch('heat.db.api._purge_stacks') as mock_ps: db_api.purge_deleted(age=0, batch_size=2) self.assertEqual(4, mock_ps.call_count) diff --git a/heat/tests/db/test_sqlalchemy_filters.py b/heat/tests/db/test_sqlalchemy_filters.py index e3424aee7..6e8f2d312 100644 --- a/heat/tests/db/test_sqlalchemy_filters.py +++ b/heat/tests/db/test_sqlalchemy_filters.py @@ -13,7 +13,7 @@ from unittest import mock -from heat.db.sqlalchemy import filters as db_filters +from heat.db import filters as db_filters from heat.tests import common diff --git a/heat/tests/db/test_sqlalchemy_types.py b/heat/tests/db/test_sqlalchemy_types.py index 47b460a55..051962d18 100644 --- a/heat/tests/db/test_sqlalchemy_types.py +++ b/heat/tests/db/test_sqlalchemy_types.py @@ -15,7 +15,7 @@ from sqlalchemy.dialects.mysql import base as mysql_base from sqlalchemy.dialects.sqlite import base as sqlite_base from sqlalchemy import types -from heat.db.sqlalchemy import types as db_types +from heat.db import types as db_types from heat.tests import common diff --git a/heat/tests/engine/service/test_software_config.py b/heat/tests/engine/service/test_software_config.py index ecd7bef62..9aba366a5 100644 --- a/heat/tests/engine/service/test_software_config.py +++ b/heat/tests/engine/service/test_software_config.py @@ -22,7 +22,7 @@ from oslo_utils import timeutils from heat.common import crypt from heat.common import exception from heat.common import template_format -from heat.db.sqlalchemy import api as db_api +from heat.db import api as db_api from heat.engine.clients.os import swift from heat.engine.clients.os import zaqar from heat.engine import service diff --git a/heat/tests/engine/service/test_stack_update.py b/heat/tests/engine/service/test_stack_update.py index f1df832af..0712e888f 100644 --- a/heat/tests/engine/service/test_stack_update.py +++ b/heat/tests/engine/service/test_stack_update.py @@ -24,7 +24,7 @@ from heat.common import exception from heat.common import messaging from heat.common import service_utils from heat.common import template_format -from heat.db.sqlalchemy import api as db_api +from heat.db import api as db_api from heat.engine.clients.os import glance from heat.engine.clients.os import nova from heat.engine.clients.os import swift diff --git a/heat/tests/engine/test_engine_worker.py b/heat/tests/engine/test_engine_worker.py index 0eed84fb0..de873b2aa 100644 --- a/heat/tests/engine/test_engine_worker.py +++ b/heat/tests/engine/test_engine_worker.py @@ -15,7 +15,7 @@ from unittest import mock -from heat.db.sqlalchemy import api as db_api +from heat.db import api as db_api from heat.engine import check_resource from heat.engine import stack as parser from heat.engine import template as templatem diff --git a/heat/tests/test_common_service_utils.py b/heat/tests/test_common_service_utils.py index 0745e8f85..2b363607c 100644 --- a/heat/tests/test_common_service_utils.py +++ b/heat/tests/test_common_service_utils.py @@ -18,7 +18,7 @@ from oslo_utils import timeutils import uuid from heat.common import service_utils -from heat.db.sqlalchemy import models +from heat.db import models from heat.tests import common diff --git a/heat/tests/test_engine_api_utils.py b/heat/tests/test_engine_api_utils.py index 8703fcdda..6cee13b03 100644 --- a/heat/tests/test_engine_api_utils.py +++ b/heat/tests/test_engine_api_utils.py @@ -21,7 +21,7 @@ from oslo_utils import timeutils from heat.common import exception from heat.common import template_format from heat.common import timeutils as heat_timeutils -from heat.db.sqlalchemy import models +from heat.db import models from heat.engine import api from heat.engine.cfn import parameters as cfn_param from heat.engine import event diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py index 8d9a2521b..0efdf9caf 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -16,7 +16,7 @@ from unittest import mock from oslo_config import cfg import uuid -from heat.db.sqlalchemy import models +from heat.db import models from heat.engine import event from heat.engine import stack from heat.engine import template diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index b4f8f05c0..e3d0c97ef 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -27,8 +27,8 @@ from heat.common import exception from heat.common.i18n import _ from heat.common import short_id from heat.common import timeutils -from heat.db.sqlalchemy import api as db_api -from heat.db.sqlalchemy import models +from heat.db import api as db_api +from heat.db import models from heat.engine import attributes from heat.engine.cfn import functions as cfn_funcs from heat.engine import clients diff --git a/heat/tests/test_resource_properties_data.py b/heat/tests/test_resource_properties_data.py index 2ef5374cf..bcf677564 100644 --- a/heat/tests/test_resource_properties_data.py +++ b/heat/tests/test_resource_properties_data.py @@ -13,7 +13,7 @@ from oslo_config import cfg -from heat.db.sqlalchemy import models +from heat.db import models from heat.objects import resource_properties_data as rpd_object from heat.tests import common from heat.tests import utils diff --git a/heat/tests/test_signal.py b/heat/tests/test_signal.py index bb0b8313b..b2d754abb 100644 --- a/heat/tests/test_signal.py +++ b/heat/tests/test_signal.py @@ -20,7 +20,7 @@ from oslo_utils import timeutils from heat.common import exception from heat.common import template_format -from heat.db.sqlalchemy import models +from heat.db import models from heat.engine.clients.os import heat_plugin from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks from heat.engine.clients.os import swift diff --git a/heat/tests/test_stack.py b/heat/tests/test_stack.py index 35374190c..278df8e23 100644 --- a/heat/tests/test_stack.py +++ b/heat/tests/test_stack.py @@ -27,7 +27,7 @@ from heat.common import context from heat.common import exception from heat.common import template_format from heat.common import timeutils -from heat.db.sqlalchemy import api as db_api +from heat.db import api as db_api from heat.engine.clients.os import keystone from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks from heat.engine.clients.os import nova diff --git a/heat/tests/test_stack_update.py b/heat/tests/test_stack_update.py index a466cef4f..b441f3ebf 100644 --- a/heat/tests/test_stack_update.py +++ b/heat/tests/test_stack_update.py @@ -17,7 +17,7 @@ from unittest import mock from heat.common import exception from heat.common import template_format -from heat.db.sqlalchemy import api as db_api +from heat.db import api as db_api from heat.engine.clients.os.keystone import fake_keystoneclient from heat.engine import environment from heat.engine import resource diff --git a/heat/tests/utils.py b/heat/tests/utils.py index ea9aa6329..44c81c294 100644 --- a/heat/tests/utils.py +++ b/heat/tests/utils.py @@ -24,8 +24,8 @@ import sqlalchemy from sqlalchemy import exc as sqla_exc from heat.common import context -from heat.db.sqlalchemy import api as db_api -from heat.db.sqlalchemy import models +from heat.db import api as db_api +from heat.db import models from heat.engine import environment from heat.engine import node_data from heat.engine import resource |