Merge "Fix import statement order"

nova/tests/functional/db/test_aggregate.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 from copy import deepcopy
+
 import mock
 from oslo_db import exception as db_exc
 from oslo_utils import timeutils
@@ -20,13 +21,12 @@ from nova import db
 from nova.db.sqlalchemy import api as db_api
 from nova.db.sqlalchemy import api_models
 from nova import exception
+import nova.objects.aggregate as aggregate_obj
 from nova import test
 from nova.tests.unit import matchers
 from nova.tests.unit.objects.test_objects import compare_obj as base_compare
 from nova.tests import uuidsentinel
 
-import nova.objects.aggregate as aggregate_obj
-
 
 SUBS = {'metadata': 'metadetails'}
 

nova/tests/functional/notification_sample_tests/notification_sample_base.py

@@ -12,10 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
 import time
 
+import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import fixture as utils_fixture

nova/tests/functional/regressions/test_bug_1595962.py

@@ -12,9 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import time
+
 import fixtures
 import mock
-import time
 
 import nova.conf
 from nova import test

nova/tests/unit/api/openstack/compute/test_hypervisors.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import copy
+
 import mock
 import netaddr
 from oslo_serialization import jsonutils

nova/tests/unit/db/test_sqlalchemy_migration.py

@@ -13,12 +13,12 @@
 #    under the License.
 
 import importlib
-import mock
 import uuid
 
 from migrate import exceptions as versioning_exceptions
 from migrate import UniqueConstraint
 from migrate.versioning import api as versioning_api
+import mock
 from oslo_db.sqlalchemy import utils as db_utils
 import sqlalchemy
 

nova/tests/unit/objects/test_host_mapping.py

@@ -13,9 +13,8 @@
 import mock
 
 from nova import objects
-from nova import test
-
 from nova.objects import host_mapping
+from nova import test
 from nova.tests.unit.objects import test_cell_mapping
 from nova.tests.unit.objects import test_objects
 

nova/tests/unit/scheduler/client/test_report.py

@@ -10,9 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
-
 from keystoneauth1 import exceptions as ks_exc
+import mock
 
 import nova.conf
 from nova import context

nova/tests/unit/test_policy.py

@@ -15,9 +15,9 @@
 
 """Test of Policy Engine For Nova."""
 
-import mock
 import os.path
 
+import mock
 from oslo_policy import policy as oslo_policy
 from oslo_serialization import jsonutils
 import requests_mock

nova/tests/unit/virt/libvirt/fake_imagebackend.py

@@ -14,10 +14,11 @@
 #    under the License.
 
 import collections
-import fixtures
 import functools
-import mock
 import os
+
+import fixtures
+import mock
 import six
 
 from nova.virt.libvirt import config

nova/tests/unit/virt/libvirt/storage/test_dmcrypt.py

@@ -14,7 +14,6 @@
 #    under the License.
 
 import mock
-
 from oslo_concurrency import processutils
 
 from nova import test

nova/tests/unit/virt/libvirt/volume/test_vzstorage.py

@@ -10,14 +10,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
 
+import mock
+from os_brick.initiator import connector
+
 from nova import exception
 from nova.tests.unit.virt.libvirt.volume import test_volume
 from nova import utils
 from nova.virt.libvirt.volume import vzstorage
-from os_brick.initiator import connector
 
 
 class LibvirtVZStorageTestCase(test_volume.LibvirtVolumeBaseTestCase):

nova/tests/unit/virt/xenapi/stubs.py

@@ -13,12 +13,12 @@
 
 """Stubouts, mocks and fixtures for the test suite."""
 
-import mock
 import pickle
 import random
 import sys
 
 import fixtures
+import mock
 from oslo_serialization import jsonutils
 import six