Merge "Reorder test imports by full import path"

tests/_ldap_livetest.py

@@ -17,8 +17,8 @@
 import subprocess
 
 from keystone import config
-from keystone import test
 from keystone.identity.backends import ldap as identity_ldap
+from keystone import test
 
 import default_fixtures
 import test_backend

tests/test_auth_token_middleware.py

@@ -14,9 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import webob
 import datetime
 import iso8601
+import webob
 
 from keystone.middleware import auth_token
 from keystone.openstack.common import jsonutils

tests/test_backend_kvs.py

@@ -15,15 +15,15 @@
 # under the License.
 import uuid
 
-from keystone import exception
-from keystone import test
-from keystone.identity.backends import kvs as identity_kvs
-from keystone.token.backends import kvs as token_kvs
-from keystone.catalog.backends import kvs as catalog_kvs
 from keystone import catalog
+from keystone.catalog.backends import kvs as catalog_kvs
+from keystone import exception
+from keystone.identity.backends import kvs as identity_kvs
+from keystone import test
+from keystone.token.backends import kvs as token_kvs
 
-import test_backend
 import default_fixtures
+import test_backend
 
 
 class KvsIdentity(test.TestCase, test_backend.IdentityTests):

tests/test_backend_ldap.py

@@ -16,11 +16,11 @@
 
 import uuid
 
+from keystone.common.ldap import fakeldap
 from keystone import config
 from keystone import exception
-from keystone import test
-from keystone.common.ldap import fakeldap
 from keystone.identity.backends import ldap as identity_ldap
+from keystone import test
 
 import default_fixtures
 import test_backend

tests/test_backend_sql.py

@@ -16,15 +16,15 @@
 
 import uuid
 
+from keystone.common.sql import util as sql_util
 from keystone import config
 from keystone import exception
-from keystone import test
-from keystone.common.sql import util as sql_util
 from keystone.identity.backends import sql as identity_sql
+from keystone import test
 from keystone.token.backends import sql as token_sql
 
-import test_backend
 import default_fixtures
+import test_backend
 
 
 CONF = config.CONF

tests/test_backend_templated.py

@@ -17,13 +17,13 @@
 import os
 import uuid
 
+from keystone import catalog
+from keystone.catalog.backends import templated as catalog_templated
 from keystone import exception
 from keystone import test
-from keystone.catalog.backends import templated as catalog_templated
-from keystone import catalog
 
-import test_backend
 import default_fixtures
+import test_backend
 
 DEFAULT_CATALOG_TEMPLATES = os.path.abspath(os.path.join(
                                 os.path.dirname(__file__),

tests/test_import_legacy.py

@@ -19,12 +19,12 @@ import os
 import sqlite3
 #import sqlalchemy
 
-from keystone import config
-from keystone import test
+from keystone.catalog.backends import templated as catalog_templated
 from keystone.common.sql import legacy
 from keystone.common.sql import util as sql_util
+from keystone import config
 from keystone.identity.backends import sql as identity_sql
-from keystone.catalog.backends import templated as catalog_templated
+from keystone import test
 
 
 CONF = config.CONF

tests/test_keystoneclient_sql.py

@@ -16,9 +16,9 @@
 
 import uuid
 
+from keystone.common.sql import util as sql_util
 from keystone import config
 from keystone import test
-from keystone.common.sql import util as sql_util
 
 import test_keystoneclient
 

tests/test_middleware.py

@@ -18,8 +18,8 @@ import webob
 
 from keystone import config
 from keystone import middleware
-from keystone import test
 from keystone.openstack.common import jsonutils
+from keystone import test
 
 
 CONF = config.CONF

tests/test_policy.py

@@ -19,11 +19,11 @@ import StringIO
 import tempfile
 import urllib2
 
+from keystone.common import policy as common_policy
 from keystone import config
 from keystone import exception
-from keystone import test
-from keystone.common import policy as common_policy
 from keystone.policy.backends import rules
+from keystone import test
 
 
 CONF = config.CONF

tests/test_serializer.py

@@ -16,8 +16,8 @@
 
 import re
 
-from keystone import test
 from keystone.common import serializer
+from keystone import test
 
 
 class XmlSerializerTestCase(test.TestCase):

tests/test_ssl.py

@@ -15,12 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import httplib
+import os
 import ssl
 
-from keystone import test
 from keystone import config
+from keystone import test
 
 
 CONF = config.CONF

tests/test_utils.py

@@ -29,8 +29,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from keystone import test
 from keystone.common import utils
+from keystone import test
 
 
 class UtilsTestCase(test.TestCase):

tests/test_versions.py

@@ -16,8 +16,8 @@
 # limitations under the License.
 
 from keystone import config
-from keystone import test
 from keystone.openstack.common import jsonutils
+from keystone import test
 
 
 CONF = config.CONF

tests/test_wsgi.py

@@ -16,9 +16,9 @@
 
 import webob
 
-from keystone import test
 from keystone.common import wsgi
 from keystone.openstack.common import jsonutils
+from keystone import test
 
 
 class ApplicationTest(test.TestCase):