Enable H305 and H307 style checks
Correct grouping and ordering of imports
Change-Id: I47ea0d53f80d7f0aeb01c1c6afd63713be87ddf4
diff --git a/common/remote_client.py b/common/remote_client.py
index 3b48545..5365ceb 100644
--- a/common/remote_client.py
+++ b/common/remote_client.py
@@ -12,13 +12,14 @@
import cStringIO
import logging
-import paramiko
import re
import select
-import six
import socket
import time
+import paramiko
+import six
+
from heat_integrationtests.common import exceptions
LOG = logging.getLogger(__name__)
diff --git a/common/test.py b/common/test.py
index 57083fd..4c96567 100644
--- a/common/test.py
+++ b/common/test.py
@@ -10,19 +10,19 @@
# License for the specific language governing permissions and limitations
# under the License.
-import fixtures
import logging
import os
import random
import re
-import six
import subprocess
-import testscenarios
-import testtools
import time
+import fixtures
from heatclient import exc as heat_exceptions
from oslo.utils import timeutils
+import six
+import testscenarios
+import testtools
from heat_integrationtests.common import clients
from heat_integrationtests.common import config
diff --git a/functional/test_remote_stack.py b/functional/test_remote_stack.py
index d9eec79..1b6f961 100644
--- a/functional/test_remote_stack.py
+++ b/functional/test_remote_stack.py
@@ -11,10 +11,11 @@
# under the License.
import logging
+
+from heatclient import exc
import six
from heat_integrationtests.common import test
-from heatclient import exc
LOG = logging.getLogger(__name__)
diff --git a/functional/test_resource_group.py b/functional/test_resource_group.py
index 8ccddd8..6c68a19 100644
--- a/functional/test_resource_group.py
+++ b/functional/test_resource_group.py
@@ -10,9 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-import six
-
from heatclient import exc
+import six
from heat_integrationtests.common import test
diff --git a/functional/test_template_resource.py b/functional/test_template_resource.py
index 828ff74..6b3fabb 100644
--- a/functional/test_template_resource.py
+++ b/functional/test_template_resource.py
@@ -12,6 +12,7 @@
import json
import logging
+
import yaml
from heat_integrationtests.common import test
diff --git a/scenario/test_volumes.py b/scenario/test_volumes.py
index fe9ec03..841a091 100644
--- a/scenario/test_volumes.py
+++ b/scenario/test_volumes.py
@@ -11,10 +11,10 @@
# under the License.
import logging
-import six
-from testtools import testcase
from cinderclient import exceptions as cinder_exceptions
+import six
+from testtools import testcase
from heat_integrationtests.common import exceptions
from heat_integrationtests.common import test