Merge "Apply import order in more tests"

openstack/tests/unit/database/v1/test_database.py

@@ -10,9 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.tests.unit import base
-
 from openstack.database.v1 import database
+from openstack.tests.unit import base
 
 
 IDENTIFIER = 'NAME'

openstack/tests/unit/database/v1/test_flavor.py

@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.database.v1 import flavor
 from openstack.tests.unit import base
 
-from openstack.database.v1 import flavor
 
 IDENTIFIER = 'IDENTIFIER'
 EXAMPLE = {

openstack/tests/unit/database/v1/test_user.py

@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.database.v1 import user
 from openstack.tests.unit import base
 
-from openstack.database.v1 import user
 
 INSTANCE_ID = 'INSTANCE_ID'
 

openstack/tests/unit/key_manager/v1/test_container.py

@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.key_manager.v1 import container
 from openstack.tests.unit import base
 
-from openstack.key_manager.v1 import container
 
 ID_VAL = "123"
 IDENTIFIER = 'http://localhost/containers/%s' % ID_VAL

openstack/tests/unit/key_manager/v1/test_order.py

@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.key_manager.v1 import order
 from openstack.tests.unit import base
 
-from openstack.key_manager.v1 import order
 
 ID_VAL = "123"
 SECRET_ID = "5"

openstack/tests/unit/object_store/v1/test_account.py

@@ -10,9 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.tests.unit import base
-
 from openstack.object_store.v1 import account
+from openstack.tests.unit import base
 
 
 CONTAINER_NAME = "mycontainer"

openstack/tests/unit/object_store/v1/test_proxy.py

@@ -9,7 +9,6 @@
 # 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 testscenarios import load_tests_apply_scenarios as load_tests  # noqa
 
 from hashlib import sha1
 import random
@@ -18,6 +17,8 @@ import tempfile
 import time
 from unittest import mock
 
+from testscenarios import load_tests_apply_scenarios as load_tests  # noqa
+
 from openstack.object_store.v1 import account
 from openstack.object_store.v1 import container
 from openstack.object_store.v1 import obj

tox.ini

@@ -137,9 +137,6 @@ per-file-ignores =
     openstack/tests/unit/network/*:H306,I100,I201,I202
     openstack/tests/unit/image/*:H306,I100,I201,I202
     openstack/tests/unit/dns/*:H306,I100,I201,I202
-    openstack/tests/unit/database/*:H306,I100,I201,I202
-    openstack/tests/unit/key_manager/*:H306,I100,I201,I202
-    openstack/tests/unit/object_store/*:H306,I100,I201,I202
 
 [flake8:local-plugins]
 extension =