From f7338aa0085e6a066a96493b8f13a7af9692520e Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Thu, 6 Feb 2014 14:15:28 +0200 Subject: [PATCH] Order imports in alphabetical order (7/9) This patch is one in a series to re-enable H306 style check rule (imports are in alphabetical order). It touches roughly half of tests (up to and including test_m*). Implements: blueprint reduce-flake8-ignored-rules (partial) Change-Id: Id1e10f7a519ceeb4339488760b36950440461edb --- heat/tests/common.py | 11 +++--- heat/tests/db/test_migrations.py | 6 +-- heat/tests/generic_resource.py | 3 +- heat/tests/test_api_aws.py | 2 +- heat/tests/test_api_cfn_v1.py | 8 ++-- heat/tests/test_api_cloudwatch.py | 6 +-- heat/tests/test_api_ec2token.py | 11 +++--- heat/tests/test_api_openstack_v1.py | 29 +++++++------- ..._openstack_v1_views_stacks_view_builder.py | 2 +- ...est_api_openstack_v1_views_views_common.py | 2 +- heat/tests/test_auth_password.py | 2 +- heat/tests/test_autoscaling.py | 20 +++++----- heat/tests/test_autoscaling_update_policy.py | 12 +++--- heat/tests/test_ceilometer_alarm.py | 22 +++++------ heat/tests/test_cloudwatch.py | 4 +- heat/tests/test_common_policy.py | 2 +- heat/tests/test_cw_alarm.py | 4 +- heat/tests/test_dbinstance.py | 2 +- heat/tests/test_dependencies.py | 2 +- heat/tests/test_eip.py | 9 ++--- heat/tests/test_engine_api_utils.py | 18 ++++----- heat/tests/test_engine_service.py | 38 +++++++++---------- heat/tests/test_environment.py | 13 +++---- heat/tests/test_event.py | 10 ++--- heat/tests/test_heat_autoscaling_group.py | 10 ++--- heat/tests/test_hot.py | 14 +++---- heat/tests/test_instance.py | 9 ++--- heat/tests/test_instance_group.py | 7 ++-- .../test_instance_group_update_policy.py | 7 ++-- heat/tests/test_instance_network.py | 8 ++-- heat/tests/test_loadbalancer.py | 12 +++--- heat/tests/test_metadata_refresh.py | 13 +++---- heat/tests/v1_1/fakes.py | 2 +- 33 files changed, 148 insertions(+), 172 deletions(-) diff --git a/heat/tests/common.py b/heat/tests/common.py index adaac4e7fc..f985e6a894 100644 --- a/heat/tests/common.py +++ b/heat/tests/common.py @@ -12,22 +12,21 @@ # under the License. -import fixtures import logging -import mox import os import sys import time + +import fixtures +import mox +from oslo.config import cfg import testscenarios import testtools -from oslo.config import cfg - -from heat.openstack.common.fixture import mockpatch - from heat.engine import environment from heat.engine import resources from heat.engine import scheduler +from heat.openstack.common.fixture import mockpatch class HeatTestCase(testscenarios.WithScenarios, testtools.TestCase): diff --git a/heat/tests/db/test_migrations.py b/heat/tests/db/test_migrations.py index c9960b855f..d6d1adb317 100644 --- a/heat/tests/db/test_migrations.py +++ b/heat/tests/db/test_migrations.py @@ -20,21 +20,21 @@ properly both upgrading and downgrading, and that no data loss occurs if possible. """ +import datetime import os import shutil -import sqlalchemy import subprocess import tempfile import uuid -import datetime from migrate.versioning import repository +import sqlalchemy from heat.db.sqlalchemy import migrate_repo from heat.db.sqlalchemy import migration +from heat.openstack.common.db.sqlalchemy import test_migrations from heat.openstack.common import log as logging from heat.openstack.common.py3kcompat import urlutils -from heat.openstack.common.db.sqlalchemy import test_migrations LOG = logging.getLogger(__name__) diff --git a/heat/tests/generic_resource.py b/heat/tests/generic_resource.py index 78acf1f2b3..726c660c1f 100644 --- a/heat/tests/generic_resource.py +++ b/heat/tests/generic_resource.py @@ -14,9 +14,8 @@ from heat.engine import resource from heat.engine import signal_responder from heat.engine import stack_user - -from heat.openstack.common import log as logging from heat.openstack.common.gettextutils import _ +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/tests/test_api_aws.py b/heat/tests/test_api_aws.py index bbec7db35f..2f775f72cd 100644 --- a/heat/tests/test_api_aws.py +++ b/heat/tests/test_api_aws.py @@ -12,8 +12,8 @@ # under the License. -from heat.tests.common import HeatTestCase from heat.api.aws import utils as api_utils +from heat.tests.common import HeatTestCase class AWSCommonTest(HeatTestCase): diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py index fcaa43fadf..1e8209ffc1 100644 --- a/heat/tests/test_api_cfn_v1.py +++ b/heat/tests/test_api_cfn_v1.py @@ -12,19 +12,19 @@ # under the License. import json -import mock import os +import mock from oslo.config import cfg +from heat.api.aws import exception +import heat.api.cfn.v1.stacks as stacks from heat.common import exception as heat_exception from heat.common import identifier from heat.common import policy -from heat.openstack.common import rpc from heat.common.wsgi import Request +from heat.openstack.common import rpc from heat.rpc import api as rpc_api -from heat.api.aws import exception -import heat.api.cfn.v1.stacks as stacks from heat.tests.common import HeatTestCase from heat.tests import utils diff --git a/heat/tests/test_api_cloudwatch.py b/heat/tests/test_api_cloudwatch.py index 13a4f7ef56..9006e5a5a7 100644 --- a/heat/tests/test_api_cloudwatch.py +++ b/heat/tests/test_api_cloudwatch.py @@ -15,11 +15,11 @@ import os from oslo.config import cfg -from heat.common import policy -from heat.openstack.common import rpc -from heat.common.wsgi import Request from heat.api.aws import exception import heat.api.cloudwatch.watch as watches +from heat.common import policy +from heat.common.wsgi import Request +from heat.openstack.common import rpc from heat.rpc import api as engine_api from heat.tests.common import HeatTestCase from heat.tests import utils diff --git a/heat/tests/test_api_ec2token.py b/heat/tests/test_api_ec2token.py index 58d38443c6..82ba7e2bcb 100644 --- a/heat/tests/test_api_ec2token.py +++ b/heat/tests/test_api_ec2token.py @@ -12,17 +12,16 @@ # under the License. -from heat.tests.common import HeatTestCase - -import requests import json -from oslo.config import cfg +from oslo.config import cfg +import requests + +from heat.api.aws import ec2token from heat.api.aws import exception from heat.common.wsgi import Request -from heat.api.aws import ec2token - from heat.openstack.common import importutils +from heat.tests.common import HeatTestCase class Ec2TokenTest(HeatTestCase): diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py index df2d0b6d05..c57deaf5cf 100644 --- a/heat/tests/test_api_openstack_v1.py +++ b/heat/tests/test_api_openstack_v1.py @@ -12,35 +12,32 @@ # under the License. import json -import mock +import mock from oslo.config import cfg import webob.exc -from heat.common import identifier -from heat.openstack.common import rpc - +import heat.api.middleware.fault as fault +import heat.api.openstack.v1 as api_v1 +import heat.api.openstack.v1.actions as actions +import heat.api.openstack.v1.build_info as build_info +import heat.api.openstack.v1.events as events +import heat.api.openstack.v1.resources as resources +import heat.api.openstack.v1.software_configs as software_configs +import heat.api.openstack.v1.software_deployments as software_deployments +import heat.api.openstack.v1.stacks as stacks from heat.common import exception as heat_exc +from heat.common import identifier from heat.common import policy -from heat.common.wsgi import Request from heat.common import urlfetch +from heat.common.wsgi import Request +from heat.openstack.common import rpc from heat.openstack.common.rpc import common as rpc_common from heat.rpc import api as rpc_api from heat.rpc import client as rpc_client from heat.tests.common import HeatTestCase - -import heat.api.openstack.v1 as api_v1 -import heat.api.openstack.v1.stacks as stacks -import heat.api.openstack.v1.resources as resources -import heat.api.openstack.v1.events as events -import heat.api.openstack.v1.actions as actions -import heat.api.openstack.v1.build_info as build_info -import heat.api.openstack.v1.software_configs as software_configs -import heat.api.openstack.v1.software_deployments as software_deployments from heat.tests import utils -import heat.api.middleware.fault as fault - def request_with_middleware(middleware, func, req, *args, **kwargs): diff --git a/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py b/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py index d73b29343f..682eea2602 100644 --- a/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py +++ b/heat/tests/test_api_openstack_v1_views_stacks_view_builder.py @@ -13,9 +13,9 @@ import mock -from heat.tests.common import HeatTestCase from heat.api.openstack.v1.views import stacks_view from heat.common import identifier +from heat.tests.common import HeatTestCase class TestFormatStack(HeatTestCase): diff --git a/heat/tests/test_api_openstack_v1_views_views_common.py b/heat/tests/test_api_openstack_v1_views_views_common.py index 6b97bd9e89..2edf20c59e 100644 --- a/heat/tests/test_api_openstack_v1_views_views_common.py +++ b/heat/tests/test_api_openstack_v1_views_views_common.py @@ -13,9 +13,9 @@ import mock -from heat.tests.common import HeatTestCase from heat.api.openstack.v1.views import views_common from heat.openstack.common.py3kcompat import urlutils +from heat.tests.common import HeatTestCase class TestViewsCommon(HeatTestCase): diff --git a/heat/tests/test_auth_password.py b/heat/tests/test_auth_password.py index 015c5a3800..695020de2d 100644 --- a/heat/tests/test_auth_password.py +++ b/heat/tests/test_auth_password.py @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from keystoneclient.v2_0 import client as keystone_client from keystoneclient.exceptions import Unauthorized +from keystoneclient.v2_0 import client as keystone_client import webob from heat.common.auth_password import KeystonePasswordAuthProtocol diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py index bfdba31138..e4b698560a 100644 --- a/heat/tests/test_autoscaling.py +++ b/heat/tests/test_autoscaling.py @@ -11,31 +11,29 @@ # License for the specific language governing permissions and limitations # under the License. -import datetime import copy +import datetime import mock import mox - +from oslo.config import cfg from testtools import skipIf -from oslo.config import cfg - +from heat.common import exception from heat.common import short_id from heat.common import template_format -from heat.common import exception -from heat.engine.resources import autoscaling as asc -from heat.engine.resources import loadbalancer -from heat.engine.resources import instance -from heat.engine.resources.neutron import loadbalancer as neutron_lb from heat.engine.notification import autoscaling as notification from heat.engine import parser from heat.engine import resource -from heat.engine import scheduler from heat.engine.resource import Metadata +from heat.engine.resources import autoscaling as asc from heat.engine.resources import image -from heat.openstack.common import timeutils +from heat.engine.resources import instance +from heat.engine.resources import loadbalancer +from heat.engine.resources.neutron import loadbalancer as neutron_lb +from heat.engine import scheduler from heat.openstack.common.importutils import try_import +from heat.openstack.common import timeutils from heat.tests.common import HeatTestCase from heat.tests import fakes from heat.tests import utils diff --git a/heat/tests/test_autoscaling_update_policy.py b/heat/tests/test_autoscaling_update_policy.py index e5752298c0..01dd4ebae4 100644 --- a/heat/tests/test_autoscaling_update_policy.py +++ b/heat/tests/test_autoscaling_update_policy.py @@ -11,26 +11,26 @@ # License for the specific language governing permissions and limitations # under the License. -import mox -import json import copy +import json +import mox from oslo.config import cfg +from testtools.matchers import MatchesRegex from heat.common import exception from heat.common import template_format -from heat.engine.notification import stack as notification from heat.engine import clients +from heat.engine.notification import stack as notification from heat.engine import parser -from heat.engine import stack_user from heat.engine.resources import instance from heat.engine.resources import loadbalancer as lb from heat.engine.resources import wait_condition as wc +from heat.engine import stack_user from heat.tests.common import HeatTestCase -from heat.tests import utils from heat.tests import fakes +from heat.tests import utils from heat.tests.v1_1 import fakes as fakes11 -from testtools.matchers import MatchesRegex asg_tmpl_without_updt_policy = ''' diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py index 776a9b1084..82271043a9 100644 --- a/heat/tests/test_ceilometer_alarm.py +++ b/heat/tests/test_ceilometer_alarm.py @@ -11,31 +11,27 @@ # License for the specific language governing permissions and limitations # under the License. - import copy import json + import mox -import testtools - from oslo.config import cfg - -from heat.tests import fakes -from heat.tests import generic_resource -from heat.tests.common import HeatTestCase -from heat.tests import utils +import testtools from heat.common import exception from heat.common import template_format - -from heat.openstack.common.importutils import try_import - from heat.engine import clients from heat.engine import parser +from heat.engine.properties import schemata from heat.engine import resource +from heat.engine.resources.ceilometer import alarm from heat.engine import scheduler from heat.engine import stack_user -from heat.engine.properties import schemata -from heat.engine.resources.ceilometer import alarm +from heat.openstack.common.importutils import try_import +from heat.tests.common import HeatTestCase +from heat.tests import fakes +from heat.tests import generic_resource +from heat.tests import utils ceilometerclient = try_import('ceilometerclient.v2') diff --git a/heat/tests/test_cloudwatch.py b/heat/tests/test_cloudwatch.py index 2624f66562..3c84e554ea 100644 --- a/heat/tests/test_cloudwatch.py +++ b/heat/tests/test_cloudwatch.py @@ -15,10 +15,10 @@ from mock import patch from heat.common import exception from heat.common import template_format -from heat.tests import common -from heat.tests import utils from heat.engine import scheduler from heat.engine import watchrule +from heat.tests import common +from heat.tests import utils AWS_CloudWatch_Alarm = ''' diff --git a/heat/tests/test_common_policy.py b/heat/tests/test_common_policy.py index 461010ed05..be2182384d 100644 --- a/heat/tests/test_common_policy.py +++ b/heat/tests/test_common_policy.py @@ -17,8 +17,8 @@ import os.path from oslo.config import cfg -from heat.common import policy from heat.common import exception +from heat.common import policy from heat.openstack.common import policy as base_policy from heat.tests.common import HeatTestCase from heat.tests import utils diff --git a/heat/tests/test_cw_alarm.py b/heat/tests/test_cw_alarm.py index 3dea10a054..f44cddad47 100644 --- a/heat/tests/test_cw_alarm.py +++ b/heat/tests/test_cw_alarm.py @@ -15,10 +15,10 @@ import copy from heat.common import template_format -from heat.engine.resources import cloud_watch from heat.engine import resource -from heat.engine import watchrule +from heat.engine.resources import cloud_watch from heat.engine import scheduler +from heat.engine import watchrule from heat.tests.common import HeatTestCase from heat.tests import utils diff --git a/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py index bd3cd79f5a..9d69e13aae 100644 --- a/heat/tests/test_dbinstance.py +++ b/heat/tests/test_dbinstance.py @@ -12,10 +12,10 @@ # under the License. from heat.common import template_format +from heat.engine import parser from heat.engine import resource from heat.tests.common import HeatTestCase from heat.tests import utils -from heat.engine import parser rds_template = ''' diff --git a/heat/tests/test_dependencies.py b/heat/tests/test_dependencies.py index 0d37b515b4..1c28f910bc 100644 --- a/heat/tests/test_dependencies.py +++ b/heat/tests/test_dependencies.py @@ -14,8 +14,8 @@ import testtools -from heat.engine.dependencies import Dependencies from heat.engine.dependencies import CircularDependencyException +from heat.engine.dependencies import Dependencies class dependenciesTest(testtools.TestCase): diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py index dcb9eb6cd3..3f118f6df9 100644 --- a/heat/tests/test_eip.py +++ b/heat/tests/test_eip.py @@ -12,20 +12,19 @@ # under the License. import mox - from testtools import skipIf from heat.common import exception from heat.common import template_format -from heat.engine.resources import eip from heat.engine import clients -from heat.engine import resource -from heat.engine import scheduler from heat.engine import parser +from heat.engine import resource +from heat.engine.resources import eip +from heat.engine import scheduler from heat.tests.common import HeatTestCase -from heat.tests.v1_1 import fakes from heat.tests import fakes as fakec from heat.tests import utils +from heat.tests.v1_1 import fakes eip_template = ''' diff --git a/heat/tests/test_engine_api_utils.py b/heat/tests/test_engine_api_utils.py index 4ef2cc387c..81a676a72d 100644 --- a/heat/tests/test_engine_api_utils.py +++ b/heat/tests/test_engine_api_utils.py @@ -11,19 +11,19 @@ # License for the specific language governing permissions and limitations # under the License. -import json -import mock -import uuid from datetime import datetime +import json +import uuid -import heat.engine.api as api +import mock -from heat.common import template_format -from heat.engine import parser -from heat.engine import parameters -from heat.engine import resource -from heat.engine.event import Event from heat.common.identifier import EventIdentifier +from heat.common import template_format +from heat.engine import api +from heat.engine.event import Event +from heat.engine import parameters +from heat.engine import parser +from heat.engine import resource from heat.rpc import api as rpc_api from heat.tests.common import HeatTestCase from heat.tests import generic_resource as generic_rsrc diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index 30779fefd8..f206b12445 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -13,47 +13,43 @@ import functools -from eventlet import greenpool import json import sys import uuid +from eventlet import greenpool import mock import mox - from oslo.config import cfg -cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config') - from heat.common import exception -from heat.common import urlfetch -from heat.tests import fakes as test_fakes -from heat.tests.v1_1 import fakes -import heat.rpc.api as engine_api -import heat.db.api as db_api from heat.common import identifier from heat.common import template_format +from heat.common import urlfetch +import heat.db.api as db_api from heat.engine import clients from heat.engine import dependencies from heat.engine import environment from heat.engine import parser -from heat.engine.resource import _register_class -from heat.engine import service from heat.engine.properties import Properties from heat.engine import resource as res from heat.engine.resources import instance as instances from heat.engine.resources import nova_utils -from heat.engine import resource as rsrs +from heat.engine import service from heat.engine import stack_lock from heat.engine import watchrule from heat.openstack.common.fixture import mockpatch -from heat.openstack.common import threadgroup from heat.openstack.common.rpc import common as rpc_common from heat.openstack.common.rpc import proxy +from heat.openstack.common import threadgroup +import heat.rpc.api as engine_api from heat.tests.common import HeatTestCase +from heat.tests import fakes as test_fakes from heat.tests import generic_resource as generic_rsrc from heat.tests import utils +from heat.tests.v1_1 import fakes +cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config') wp_template = ''' { @@ -1298,8 +1294,8 @@ class StackServiceAuthorizeTest(HeatTestCase): self.eng = service.EngineService('a-host', 'a-topic') cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role') - _register_class('ResourceWithPropsType', - generic_rsrc.ResourceWithProps) + res._register_class('ResourceWithPropsType', + generic_rsrc.ResourceWithProps) utils.setup_dummy_db() @@ -1373,8 +1369,8 @@ class StackServiceTest(HeatTestCase): self.eng = service.EngineService('a-host', 'a-topic') cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role') - _register_class('ResourceWithPropsType', - generic_rsrc.ResourceWithProps) + res._register_class('ResourceWithPropsType', + generic_rsrc.ResourceWithProps) utils.setup_dummy_db() @@ -1495,8 +1491,8 @@ class StackServiceTest(HeatTestCase): @stack_context('event_list_deleted_stack') def test_stack_event_list_deleted_resource(self): - rsrs._register_class('GenericResourceType', - generic_rsrc.GenericResource) + res._register_class('GenericResourceType', + generic_rsrc.GenericResource) thread = self.m.CreateMockAnything() thread.link(mox.IgnoreArg(), self.stack.id).AndReturn(None) @@ -2045,8 +2041,8 @@ class StackServiceTest(HeatTestCase): service.EngineService.load_user_creds( mox.IgnoreArg()).AndReturn(self.ctx) - self.m.StubOutWithMock(rsrs.Resource, 'signal') - rsrs.Resource.signal(mox.IgnoreArg()).AndReturn(None) + self.m.StubOutWithMock(res.Resource, 'signal') + res.Resource.signal(mox.IgnoreArg()).AndReturn(None) self.m.ReplayAll() self.eng.resource_signal(self.ctx, diff --git a/heat/tests/test_environment.py b/heat/tests/test_environment.py index d2e6087c88..4993082118 100644 --- a/heat/tests/test_environment.py +++ b/heat/tests/test_environment.py @@ -11,22 +11,21 @@ # 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 fixtures -import mock + import os.path import sys +import fixtures +import mock from oslo.config import cfg -cfg.CONF.import_opt('environment_dir', 'heat.common.config') - from heat.common import environment_format - from heat.engine import environment from heat.engine import resources - -from heat.tests import generic_resource from heat.tests import common +from heat.tests import generic_resource + +cfg.CONF.import_opt('environment_dir', 'heat.common.config') class EnvironmentTest(common.HeatTestCase): diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py index bfb731fea2..fa2c8b4950 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -13,19 +13,17 @@ from oslo.config import cfg -cfg.CONF.import_opt('event_purge_batch_size', 'heat.common.config') -cfg.CONF.import_opt('max_events_per_stack', 'heat.common.config') - -import heat.db.api as db_api +from heat.db import api as db_api +from heat.engine import event from heat.engine import parser from heat.engine import resource from heat.engine import template -from heat.engine import event - from heat.tests.common import HeatTestCase from heat.tests import generic_resource as generic_rsrc from heat.tests import utils +cfg.CONF.import_opt('event_purge_batch_size', 'heat.common.config') +cfg.CONF.import_opt('max_events_per_stack', 'heat.common.config') tmpl = { 'Resources': { diff --git a/heat/tests/test_heat_autoscaling_group.py b/heat/tests/test_heat_autoscaling_group.py index e0cb5dd288..0b8fd546a2 100644 --- a/heat/tests/test_heat_autoscaling_group.py +++ b/heat/tests/test_heat_autoscaling_group.py @@ -17,18 +17,14 @@ from oslo.config import cfg from heat.common import exception from heat.common import template_format - from heat.engine import clients from heat.engine import resource from heat.engine import scheduler - from heat.openstack.common import timeutils - -from heat.tests import fakes -from heat.tests import utils -from heat.tests import generic_resource - from heat.tests.common import HeatTestCase +from heat.tests import fakes +from heat.tests import generic_resource +from heat.tests import utils class AutoScalingGroupTest(HeatTestCase): diff --git a/heat/tests/test_hot.py b/heat/tests/test_hot.py index 21f6462d32..339d74ea0e 100644 --- a/heat/tests/test_hot.py +++ b/heat/tests/test_hot.py @@ -10,24 +10,24 @@ # 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 heat.common import template_format + from heat.common import exception from heat.common import identifier +from heat.common import template_format +from heat.engine import constraints from heat.engine import environment from heat.engine import function -from heat.engine import parser -from heat.engine import resource from heat.engine.hot import parameters as hot_param from heat.engine.hot import template as hot_template +from heat.engine import parameters +from heat.engine import parser +from heat.engine import resource from heat.engine import resources from heat.engine import template -from heat.engine import constraints -from heat.engine import parameters - from heat.tests.common import HeatTestCase +from heat.tests import generic_resource as generic_rsrc from heat.tests import test_parser from heat.tests import utils -from heat.tests import generic_resource as generic_rsrc hot_tpl_empty = template_format.parse(''' diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py index 31fbb4e3c3..aa4db56525 100644 --- a/heat/tests/test_instance.py +++ b/heat/tests/test_instance.py @@ -15,24 +15,23 @@ import copy import uuid import mox +from neutronclient.v2_0 import client as neutronclient -from heat.engine import environment -from heat.tests.v1_1 import fakes from heat.common import exception from heat.common import template_format from heat.engine import clients +from heat.engine import environment from heat.engine import parser from heat.engine import resource -from heat.engine import scheduler from heat.engine.resources import image from heat.engine.resources import instance as instances from heat.engine.resources import network_interface from heat.engine.resources import nova_utils +from heat.engine import scheduler from heat.openstack.common import uuidutils from heat.tests.common import HeatTestCase from heat.tests import utils - -from neutronclient.v2_0 import client as neutronclient +from heat.tests.v1_1 import fakes wp_template = ''' diff --git a/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py index d08f475249..2f498718e2 100644 --- a/heat/tests/test_instance_group.py +++ b/heat/tests/test_instance_group.py @@ -12,17 +12,18 @@ # under the License. import copy + import mox from heat.common import exception from heat.common import template_format +from heat.engine import parser +from heat.engine import resource +from heat.engine import resources from heat.engine.resources import image from heat.engine.resources import instance from heat.engine.resources import nova_keypair -from heat.engine import resource -from heat.engine import resources from heat.engine import scheduler -from heat.engine import parser from heat.tests.common import HeatTestCase from heat.tests import utils diff --git a/heat/tests/test_instance_group_update_policy.py b/heat/tests/test_instance_group_update_policy.py index 5428621432..1c41e7ca09 100644 --- a/heat/tests/test_instance_group_update_policy.py +++ b/heat/tests/test_instance_group_update_policy.py @@ -11,9 +11,11 @@ # License for the specific language governing permissions and limitations # under the License. -import mox -import json import copy +import json + +import mox +from testtools.matchers import MatchesRegex from heat.common import exception from heat.common import template_format @@ -24,7 +26,6 @@ from heat.engine.resources import nova_keypair from heat.tests.common import HeatTestCase from heat.tests import utils from heat.tests.v1_1 import fakes -from testtools.matchers import MatchesRegex ig_tmpl_without_updt_policy = ''' diff --git a/heat/tests/test_instance_network.py b/heat/tests/test_instance_network.py index 0aa3fc7b51..dfdd62b3e1 100644 --- a/heat/tests/test_instance_network.py +++ b/heat/tests/test_instance_network.py @@ -13,17 +13,17 @@ import uuid +from heat.common import template_format +from heat.engine import clients from heat.engine import environment -from heat.tests.v1_1 import fakes +from heat.engine import parser from heat.engine.resources import instance as instances from heat.engine.resources import network_interface as network_interfaces from heat.engine.resources import nova_utils -from heat.common import template_format -from heat.engine import clients -from heat.engine import parser from heat.engine import scheduler from heat.tests.common import HeatTestCase from heat.tests import utils +from heat.tests.v1_1 import fakes wp_template = ''' diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py index 4cc2e95ce2..416a79d177 100644 --- a/heat/tests/test_loadbalancer.py +++ b/heat/tests/test_loadbalancer.py @@ -11,25 +11,25 @@ # License for the specific language governing permissions and limitations # under the License. +import re import mock import mox -import re - from oslo.config import cfg + from heat.common import exception from heat.common import template_format from heat.engine import clients -from heat.engine import scheduler -from heat.engine import stack_user +from heat.engine.resource import Metadata from heat.engine.resources import instance from heat.engine.resources import loadbalancer as lb from heat.engine.resources import wait_condition as wc -from heat.engine.resource import Metadata +from heat.engine import scheduler +from heat.engine import stack_user from heat.tests.common import HeatTestCase +from heat.tests import fakes as test_fakes from heat.tests import utils from heat.tests.v1_1 import fakes -from heat.tests import fakes as test_fakes lb_template = ''' diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py index 11997b3cc2..05d41ea103 100644 --- a/heat/tests/test_metadata_refresh.py +++ b/heat/tests/test_metadata_refresh.py @@ -13,22 +13,21 @@ import mox - from oslo.config import cfg -from heat.tests import fakes -from heat.tests.common import HeatTestCase -from heat.tests import utils -from heat.engine import environment from heat.common import identifier from heat.common import template_format +from heat.engine import environment from heat.engine import parser -from heat.engine import scheduler -from heat.engine import service from heat.engine.resources import image from heat.engine.resources import instance from heat.engine.resources import nova_keypair from heat.engine.resources import wait_condition as wc +from heat.engine import scheduler +from heat.engine import service +from heat.tests.common import HeatTestCase +from heat.tests import fakes +from heat.tests import utils test_template_metadata = ''' diff --git a/heat/tests/v1_1/fakes.py b/heat/tests/v1_1/fakes.py index b88b7d0135..4d73aeb03a 100644 --- a/heat/tests/v1_1/fakes.py +++ b/heat/tests/v1_1/fakes.py @@ -17,9 +17,9 @@ import httplib2 from novaclient import client as base_client from novaclient.v1_1 import client -from heat.tests import fakes from heat.openstack.common.py3kcompat import urlutils +from heat.tests import fakes class FakeClient(fakes.FakeClient, client.Client):