Fixes import order nits

Change-Id: I5a527e0f5010171a202de5894d124d213d22a073

7 files changed, 8 insertions, 11 deletions

diff --git a/tests/test_backend.py b/tests/test_backend.py
index 08280213..57e41df4 100644
--- a/tests/test_backend.py
+++ b/tests/test_backend.py
@@ -15,13 +15,13 @@
 # under the License.
 
 import datetime
-import uuid
 import default_fixtures
+import uuid
 
 from keystone.catalog import core
 from keystone import exception
-from keystone import test
 from keystone.openstack.common import timeutils
+from keystone import test
 
 
 class IdentityTests(object):
diff --git a/tests/test_backend_sql.py b/tests/test_backend_sql.py
index 8306c65e..925ea912 100644
--- a/tests/test_backend_sql.py
+++ b/tests/test_backend_sql.py
@@ -16,8 +16,8 @@
 
 import uuid
 
-from keystone.common import sql
 from keystone import catalog
+from keystone.common import sql
 from keystone import config
 from keystone import exception
 from keystone import identity
diff --git a/tests/test_drivers.py b/tests/test_drivers.py
index 5eb6eca4..439b0d30 100644
--- a/tests/test_drivers.py
+++ b/tests/test_drivers.py
@@ -2,10 +2,10 @@ import inspect
 import unittest2 as unittest
 
 from keystone import catalog
+from keystone import exception
 from keystone import identity
 from keystone import policy
 from keystone import token
-from keystone import exception
 
 
 class TestDrivers(unittest.TestCase):
diff --git a/tests/test_exception.py b/tests/test_exception.py
index eb67098b..635b65de 100644
--- a/tests/test_exception.py
+++ b/tests/test_exception.py
@@ -16,8 +16,8 @@
 
 import uuid
 
-from keystone import config
 from keystone.common import wsgi
+from keystone import config
 from keystone import exception
 from keystone.openstack.common import jsonutils
 from keystone import test
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 0b82685e..32e9ef0a 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -20,9 +20,9 @@ import webob
 
 import nose.exc
 
-from keystone import test
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
+from keystone import test
 
 
 import default_fixtures
diff --git a/tests/test_s3_token_middleware.py b/tests/test_s3_token_middleware.py
index f3cf6c2f..733c75f0 100644
--- a/tests/test_s3_token_middleware.py
+++ b/tests/test_s3_token_middleware.py
@@ -165,7 +165,3 @@ class S3TokenMiddlewareTest(unittest.TestCase):
         req.get_response(self.middleware)
         path = req.environ['PATH_INFO']
         self.assertTrue(path.startswith('/v1/AUTH_FORCED_TENANT_ID'))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_sql_upgrade.py b/tests/test_sql_upgrade.py
index ad4b7b06..d6fb52ec 100644
--- a/tests/test_sql_upgrade.py
+++ b/tests/test_sql_upgrade.py
@@ -22,9 +22,10 @@ from migrate.versioning import api as versioning_api
 import sqlalchemy
 
 from keystone.common import sql
+from keystone.common.sql import migration
 from keystone import config
 from keystone import test
-from keystone.common.sql import migration
+
 import default_fixtures