Skip to content

Commit

Permalink
Order imports in alphabetical order (8/9)
Browse files Browse the repository at this point in the history
This patch is one in a series to re-enable H306 style check rule
(imports are in alphabetical order).
It touches second half of tests (starting from test_n*).

Implements: blueprint reduce-flake8-ignored-rules (partial)
Change-Id: I5561d90a67eb5dc882200d432fda6b162011ac41
  • Loading branch information
pshchelo committed Mar 27, 2014
1 parent 2982723 commit 506d694
Show file tree
Hide file tree
Showing 48 changed files with 157 additions and 175 deletions.
2 changes: 1 addition & 1 deletion heat/tests/test_nested_stack.py
Expand Up @@ -28,9 +28,9 @@
from heat.engine import parser
from heat.engine import resource
from heat.engine import scheduler
from heat.tests.common import HeatTestCase
from heat.tests import generic_resource as generic_rsrc
from heat.tests import utils
from heat.tests.common import HeatTestCase


class NestedStackTest(HeatTestCase):
Expand Down
10 changes: 5 additions & 5 deletions heat/tests/test_neutron.py
Expand Up @@ -12,21 +12,21 @@
# under the License.

import copy
import mox

import mox
from testtools import skipIf

from heat.engine import clients
from heat.common import exception
from heat.common import template_format
from heat.engine import clients
from heat.engine import properties
from heat.engine import resource
from heat.engine import scheduler
from heat.engine.resources.neutron import net
from heat.engine.resources.neutron.neutron import NeutronResource as qr
from heat.engine.resources.neutron import provider_net
from heat.engine.resources.neutron import subnet
from heat.engine.resources.neutron import router
from heat.engine.resources.neutron.neutron import NeutronResource as qr
from heat.engine.resources.neutron import subnet
from heat.engine import scheduler
from heat.openstack.common.importutils import try_import
from heat.tests.common import HeatTestCase
from heat.tests import fakes
Expand Down
5 changes: 3 additions & 2 deletions heat/tests/test_neutron_autoscaling.py
Expand Up @@ -12,10 +12,11 @@
# under the License.

import copy
from testtools import skipIf
import uuid

import mox
from oslo.config import cfg
import uuid
from testtools import skipIf

from heat.common import template_format
from heat.db import api as db_api
Expand Down
4 changes: 2 additions & 2 deletions heat/tests/test_neutron_firewall.py
Expand Up @@ -18,12 +18,12 @@
from heat.common import exception
from heat.common import template_format
from heat.engine import clients
from heat.engine import scheduler
from heat.engine.resources.neutron import firewall
from heat.engine import scheduler
from heat.openstack.common.importutils import try_import
from heat.tests.common import HeatTestCase
from heat.tests import fakes
from heat.tests import utils
from heat.tests.common import HeatTestCase

neutronclient = try_import('neutronclient.v2_0.client')

Expand Down
4 changes: 2 additions & 2 deletions heat/tests/test_neutron_loadbalancer.py
Expand Up @@ -19,12 +19,12 @@
from heat.common import exception
from heat.common import template_format
from heat.engine import clients
from heat.engine import scheduler
from heat.engine.resources.neutron import loadbalancer
from heat.engine import scheduler
from heat.openstack.common.importutils import try_import
from heat.tests.common import HeatTestCase
from heat.tests import fakes
from heat.tests import utils
from heat.tests.common import HeatTestCase
from heat.tests.v1_1 import fakes as nova_fakes

neutronclient = try_import('neutronclient.v2_0.client')
Expand Down
4 changes: 2 additions & 2 deletions heat/tests/test_neutron_metering.py
Expand Up @@ -15,12 +15,12 @@
from heat.common import exception
from heat.common import template_format
from heat.engine import clients
from heat.engine import scheduler
from heat.engine.resources.neutron import metering
from heat.engine import scheduler
from heat.openstack.common.importutils import try_import
from heat.tests.common import HeatTestCase
from heat.tests import fakes
from heat.tests import utils
from heat.tests.common import HeatTestCase

neutronclient = try_import('neutronclient.v2_0.client')

Expand Down
6 changes: 3 additions & 3 deletions heat/tests/test_neutron_network_gateway.py
Expand Up @@ -14,18 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from mox import IgnoreArg
from testtools import skipIf

from heat.common import exception
from heat.common import template_format
from heat.engine import clients
from heat.engine import scheduler
from heat.engine.resources.neutron import network_gateway
from heat.engine import scheduler
from heat.openstack.common.importutils import try_import
from heat.tests.common import HeatTestCase
from heat.tests import fakes
from heat.tests import utils
from heat.tests.common import HeatTestCase
from mox import IgnoreArg

neutronclient = try_import('neutronclient.v2_0.client')
neutronV20 = try_import('neutronclient.neutron.v2_0')
Expand Down
12 changes: 6 additions & 6 deletions heat/tests/test_neutron_security_group.py
Expand Up @@ -11,20 +11,20 @@
# License for the specific language governing permissions and limitations
# under the License.

from neutronclient.common.exceptions import NeutronClientException
from neutronclient.v2_0 import client as neutronclient
from novaclient.v1_1 import security_group_rules as nova_sgr
from novaclient.v1_1 import security_groups as nova_sg

from heat.common import exception
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.fakes import FakeKeystoneClient
from heat.tests.v1_1 import fakes
from heat.tests import utils

from novaclient.v1_1 import security_groups as nova_sg
from novaclient.v1_1 import security_group_rules as nova_sgr
from neutronclient.common.exceptions import NeutronClientException
from neutronclient.v2_0 import client as neutronclient
from heat.tests.v1_1 import fakes


class SecurityGroupTest(HeatTestCase):
Expand Down
4 changes: 2 additions & 2 deletions heat/tests/test_neutron_vpnservice.py
Expand Up @@ -18,12 +18,12 @@
from heat.common import exception
from heat.common import template_format
from heat.engine import clients
from heat.engine import scheduler
from heat.engine.resources.neutron import vpnservice
from heat.engine import scheduler
from heat.openstack.common.importutils import try_import
from heat.tests.common import HeatTestCase
from heat.tests import fakes
from heat.tests import utils
from heat.tests.common import HeatTestCase


neutronclient = try_import('neutronclient.v2_0.client')
Expand Down
6 changes: 3 additions & 3 deletions heat/tests/test_nokey.py
Expand Up @@ -11,14 +11,14 @@
# License for the specific language governing permissions and limitations
# under the License.

from heat.tests.v1_1 import fakes
from heat.engine.resources import instance as instances
from heat.engine.resources import nova_utils
from heat.common import template_format
from heat.engine import clients
from heat.engine.resources import instance as instances
from heat.engine.resources import nova_utils
from heat.engine import scheduler
from heat.tests.common import HeatTestCase
from heat.tests import utils
from heat.tests.v1_1 import fakes


nokey_template = '''
Expand Down
14 changes: 5 additions & 9 deletions heat/tests/test_notifications.py
Expand Up @@ -11,34 +11,30 @@
# under the License.

import mock

from oslo.config import cfg

from heat.openstack.common import timeutils

from heat.common import exception
from heat.common import template_format
from heat.engine import environment
from heat.engine import parser
from heat.engine import resource

# imports for mocking
from heat.engine import signal_responder as signal
from heat.engine import stack_resource
from heat.engine.resources import autoscaling
from heat.engine.resources import image
from heat.engine.resources import instance
from heat.engine.resources import loadbalancer
from heat.engine.resources import nova_keypair
from heat.engine.resources import user
from heat.engine.resources import wait_condition as waitc

from heat.tests import generic_resource
from heat.tests import utils
from heat.engine import signal_responder as signal
from heat.engine import stack_resource
from heat.openstack.common import timeutils
from heat.tests import common

from heat.tests import generic_resource
# reuse the same template than autoscaling tests
from heat.tests.test_autoscaling import as_template
from heat.tests import utils


class NotificationTest(common.HeatTestCase):
Expand Down
6 changes: 3 additions & 3 deletions heat/tests/test_nova_floatingip.py
Expand Up @@ -10,16 +10,16 @@
# License for the specific language governing permissions and limitations
# under the License.

from novaclient.v1_1 import client as novaclient

from heat.common import template_format
from heat.engine import clients
from heat.engine.resources.nova_floatingip import NovaFloatingIp
from heat.engine.resources.nova_floatingip import NovaFloatingIpAssociation
from heat.engine import clients
from heat.engine import scheduler
from heat.tests.common import HeatTestCase
from heat.tests import utils

from novaclient.v1_1 import client as novaclient


floating_ip_template = '''
{
Expand Down
4 changes: 2 additions & 2 deletions heat/tests/test_nova_keypair.py
Expand Up @@ -17,11 +17,11 @@
from novaclient import exceptions as nova_exceptions

from heat.engine import clients
from heat.engine import scheduler
from heat.engine.resources import nova_keypair
from heat.engine import scheduler
from heat.tests.common import HeatTestCase
from heat.tests.v1_1 import fakes
from heat.tests import utils
from heat.tests.v1_1 import fakes


class NovaKeyPairTest(HeatTestCase):
Expand Down
4 changes: 2 additions & 2 deletions heat/tests/test_os_database.py
Expand Up @@ -15,11 +15,11 @@

from heat.common import exception
from heat.common import template_format
from heat.engine.clients import troveclient
from heat.engine import environment
from heat.engine import parser
from heat.engine import scheduler
from heat.engine.clients import troveclient
from heat.engine.resources import os_database
from heat.engine import scheduler
from heat.tests.common import HeatTestCase
from heat.tests import utils

Expand Down
4 changes: 2 additions & 2 deletions heat/tests/test_parameters.py
Expand Up @@ -11,15 +11,15 @@
# License for the specific language governing permissions and limitations
# under the License.

import json

import testtools
import json

from heat.common import exception
from heat.common import identifier
from heat.engine import constraints as constr
from heat.engine import parameters
from heat.engine import template
from heat.engine import constraints as constr


class ParameterTest(testtools.TestCase):
Expand Down
17 changes: 7 additions & 10 deletions heat/tests/test_parser.py
Expand Up @@ -12,35 +12,32 @@
# under the License.

import json
import mock
import time

from keystoneclient import exceptions as kc_exceptions
import mock
from mox import IgnoreArg
from oslo.config import cfg
from six.moves import xrange

from heat.engine import environment
from heat.common import exception
from heat.common import template_format
from heat.common import urlfetch
import heat.db.api as db_api
import heat.engine.cfn.functions
from heat.engine import clients
from heat.engine import environment
from heat.engine import function
from heat.engine import resource
from heat.engine import parameters
from heat.engine import parser
from heat.engine import resource
from heat.engine import scheduler
from heat.engine import template

import heat.engine.cfn.functions

from heat.tests.fakes import FakeKeystoneClient
from heat.tests.common import HeatTestCase
from heat.tests.fakes import FakeKeystoneClient
from heat.tests import generic_resource as generic_rsrc
from heat.tests import utils
from heat.tests.v1_1 import fakes
from heat.tests import generic_resource as generic_rsrc

import heat.db.api as db_api


def join(raw):
Expand Down
3 changes: 2 additions & 1 deletion heat/tests/test_plugin_loader.py
Expand Up @@ -14,10 +14,11 @@

import pkgutil
import sys

import testtools

import heat.engine
from heat.common import plugin_loader
import heat.engine


class PluginLoaderTest(testtools.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions heat/tests/test_properties.py
Expand Up @@ -11,15 +11,15 @@
# License for the specific language governing permissions and limitations
# under the License.

import testtools

from heat.engine import constraints
from heat.common import exception
from heat.engine import constraints
from heat.engine.hot import parameters as hot_param
from heat.engine import parameters
from heat.engine import properties
from heat.engine import resources
from heat.engine import support
import testtools


class PropertySchemaTest(testtools.TestCase):
Expand Down
6 changes: 3 additions & 3 deletions heat/tests/test_provider_template.py
Expand Up @@ -11,15 +11,15 @@
# License for the specific language governing permissions and limitations
# under the License.

import json
import os
import uuid
import json

import testscenarios

from heat.common import exception
from heat.common import urlfetch
from heat.common import template_format
from heat.common import urlfetch

from heat.engine import environment
from heat.engine import parser
Expand All @@ -28,8 +28,8 @@
from heat.engine import resources
from heat.engine.resources import template_resource

from heat.tests import generic_resource as generic_rsrc
from heat.tests.common import HeatTestCase
from heat.tests import generic_resource as generic_rsrc
from heat.tests import utils


Expand Down

0 comments on commit 506d694

Please sign in to comment.