Cleanup tests imports so not relative

This change cleans up the imports in tests packages by changing
relative local imports to absolute imports per OpenStack hacking
guidelines.

Change-Id: I63c493b6a263e896f92479996c4fa4f783adff9a

keystone/tests/_ldap_livetest.py

@@ -24,8 +24,7 @@ from keystone import config
 from keystone import exception
 from keystone.identity.backends import ldap as identity_ldap
 from keystone import tests
-
-import test_backend_ldap
+from keystone.tests import test_backend_ldap
 
 
 CONF = config.CONF

keystone/tests/_ldap_tls_livetest.py

@@ -22,8 +22,7 @@ from keystone import config
 from keystone import exception
 from keystone import identity
 from keystone import tests
-
-import _ldap_livetest
+from keystone.tests import _ldap_livetest
 
 
 CONF = config.CONF

keystone/tests/_sql_livetest.py

@@ -14,9 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import test_sql_upgrade
-
 from keystone import config
+from keystone.tests import test_sql_upgrade
+
 
 CONF = config.CONF
 

keystone/tests/test_associate_project_endpoint_extension.py

@@ -21,8 +21,7 @@ from keystone.common.sql import migration
 from keystone import contrib
 from keystone.openstack.common import importutils
 from keystone import tests
-
-import test_v3
+from keystone.tests import test_v3
 
 
 class TestExtensionCase(test_v3.RestfulTestCase):

keystone/tests/test_auth.py

@@ -16,17 +16,15 @@ import copy
 import datetime
 import uuid
 
-from keystone import tests
-
 from keystone import auth
 from keystone import config
 from keystone import exception
 from keystone.openstack.common import timeutils
+from keystone import tests
+from keystone.tests import default_fixtures
 from keystone import token
 from keystone import trust
 
-import default_fixtures
-
 
 CONF = config.CONF
 TIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'

keystone/tests/test_auth_plugin.py

@@ -16,10 +16,9 @@
 
 import uuid
 
-from keystone import tests
-
 from keystone import auth
 from keystone import exception
+from keystone import tests
 from keystone import token
 
 

keystone/tests/test_backend.py

@@ -18,14 +18,12 @@ import copy
 import datetime
 import uuid
 
-from keystone import tests
-
 from keystone.catalog import core
 from keystone import config
 from keystone import exception
 from keystone.openstack.common import timeutils
-
-import default_fixtures
+from keystone import tests
+from keystone.tests import default_fixtures
 
 
 CONF = config.CONF

keystone/tests/test_backend_kvs.py

@@ -18,9 +18,8 @@ import uuid
 from keystone import exception
 from keystone import identity
 from keystone import tests
-
-import default_fixtures
-import test_backend
+from keystone.tests import default_fixtures
+from keystone.tests import test_backend
 
 
 class KvsIdentity(tests.TestCase, test_backend.IdentityTests):

keystone/tests/test_backend_ldap.py

@@ -28,9 +28,8 @@ from keystone import config
 from keystone import exception
 from keystone import identity
 from keystone import tests
-
-import default_fixtures
-import test_backend
+from keystone.tests import default_fixtures
+from keystone.tests import test_backend
 
 
 CONF = config.CONF

keystone/tests/test_backend_memcache.py

@@ -20,18 +20,16 @@ import uuid
 
 import memcache
 
-from keystone import tests
-
 from keystone.common import utils
 from keystone import exception
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
+from keystone import tests
+from keystone.tests import test_backend
+from keystone.tests import test_utils
 from keystone import token
 from keystone.token.backends import memcache as token_memcache
 
-import test_backend
-import test_utils
-
 
 class MemcacheClient(object):
     """Replicates a tiny subset of memcached client interface."""

keystone/tests/test_backend_pam.py

@@ -16,10 +16,9 @@
 
 import uuid
 
-from keystone import tests
-
 from keystone import config
 from keystone.identity.backends import pam as identity_pam
+from keystone import tests
 
 
 CONF = config.CONF

keystone/tests/test_backend_sql.py

@@ -22,9 +22,8 @@ from keystone.common import sql
 from keystone import config
 from keystone import exception
 from keystone import tests
-
-import default_fixtures
-import test_backend
+from keystone.tests import default_fixtures
+from keystone.tests import test_backend
 
 
 CONF = config.CONF

keystone/tests/test_backend_templated.py

@@ -16,12 +16,11 @@
 
 import os
 
-from keystone import tests
-
 from keystone import exception
+from keystone import tests
+from keystone.tests import default_fixtures
+from keystone.tests import test_backend
 
-import default_fixtures
-import test_backend
 
 DEFAULT_CATALOG_TEMPLATES = os.path.abspath(os.path.join(
     os.path.dirname(__file__),

keystone/tests/test_catalog.py

@@ -16,7 +16,7 @@
 
 import uuid
 
-import test_content_types
+from keystone.tests import test_content_types
 
 
 BASE_URL = 'http://127.0.0.1:35357/v2'

keystone/tests/test_cert_setup.py

@@ -18,14 +18,12 @@
 import os
 import shutil
 
-from keystone import tests
-
 from keystone.common import openssl
 from keystone import exception
+from keystone import tests
+from keystone.tests import default_fixtures
 from keystone import token
 
-import default_fixtures
-
 
 ROOTDIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SSLDIR = "%s/tests/ssl/" % ROOTDIR

keystone/tests/test_config.py

@@ -14,10 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from keystone import tests
-
 from keystone import config
 from keystone import exception
+from keystone import tests
 
 
 CONF = config.CONF

keystone/tests/test_content_types.py

@@ -20,13 +20,11 @@ import uuid
 from lxml import etree
 import webtest
 
-from keystone import tests
-
 from keystone.common import extension
 from keystone.common import serializer
 from keystone.openstack.common import jsonutils
-
-import default_fixtures
+from keystone import tests
+from keystone.tests import default_fixtures
 
 
 class RestfulTestCase(tests.TestCase):

keystone/tests/test_contrib_s3_core.py

@@ -16,11 +16,9 @@
 
 import uuid
 
-from keystone import tests
-
 from keystone.contrib import s3
-
 from keystone import exception
+from keystone import tests
 
 
 class S3ContribCore(tests.TestCase):

keystone/tests/test_exception.py

@@ -16,12 +16,11 @@
 
 import uuid
 
-from keystone import tests
-
 from keystone.common import wsgi
 from keystone import config
 from keystone import exception
 from keystone.openstack.common import jsonutils
+from keystone import tests
 
 
 CONF = config.CONF

keystone/tests/test_ipv6.py

@@ -15,10 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystone import tests
-
 from keystone.common import environment
 from keystone import config
+from keystone import tests
 
 
 CONF = config.CONF

keystone/tests/test_keystoneclient.py

@@ -21,8 +21,8 @@ from keystone import config
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
 from keystone import tests
+from keystone.tests import default_fixtures
 
-import default_fixtures
 
 CONF = config.CONF
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id

keystone/tests/test_keystoneclient_sql.py

@@ -21,8 +21,7 @@ from keystoneclient.contrib.ec2 import utils as ec2_utils
 from keystone.common import sql
 from keystone import config
 from keystone import tests
-
-import test_keystoneclient
+from keystone.tests import test_keystoneclient
 
 
 CONF = config.CONF

keystone/tests/test_middleware.py

@@ -16,11 +16,10 @@
 
 import webob
 
-from keystone import tests
-
 from keystone import config
 from keystone import middleware
 from keystone.openstack.common import jsonutils
+from keystone import tests
 
 
 CONF = config.CONF

keystone/tests/test_policy.py

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

keystone/tests/test_sizelimit.py

@@ -14,11 +14,11 @@
 
 import webob
 
-from keystone import tests
-
 from keystone import config
 from keystone import exception
 from keystone import middleware
+from keystone import tests
+
 
 CONF = config.CONF
 MAX_REQUEST_BODY_SIZE = CONF.max_request_body_size

keystone/tests/test_sql_migrate_extensions.py

@@ -30,8 +30,7 @@ To run these tests against a live database:
 from keystone.contrib import endpoint_filter
 from keystone.contrib import example
 from keystone.contrib import oauth1
-
-import test_sql_upgrade
+from keystone.tests import test_sql_upgrade
 
 
 class SqlUpgradeExampleExtension(test_sql_upgrade.SqlMigrateBase):

keystone/tests/test_sql_upgrade.py

@@ -32,16 +32,14 @@ import uuid
 from migrate.versioning import api as versioning_api
 import sqlalchemy
 
-from keystone import tests
-
 from keystone.common import sql
 from keystone.common.sql import migration
 from keystone.common import utils
 from keystone import config
 from keystone import credential
 from keystone import exception
-
-import default_fixtures
+from keystone import tests
+from keystone.tests import default_fixtures
 
 
 CONF = config.CONF

keystone/tests/test_ssl.py

@@ -18,10 +18,10 @@
 import os
 import ssl
 
-from keystone import tests
-
 from keystone.common import environment
 from keystone import config
+from keystone import tests
+
 
 CONF = config.CONF
 

keystone/tests/test_url_middleware.py

@@ -16,9 +16,8 @@
 
 import webob
 
-from keystone import tests
-
 from keystone import middleware
+from keystone import tests
 
 
 class FakeApp(object):

keystone/tests/test_utils.py

@@ -34,9 +34,9 @@ import functools
 import os
 import time
 
+from keystone.common import utils
 from keystone import tests
 
-from keystone.common import utils
 
 TZ = None
 

keystone/tests/test_v3.py

@@ -27,8 +27,7 @@ from keystone import config
 from keystone.openstack.common import timeutils
 from keystone.policy.backends import rules
 from keystone import tests
-
-import test_content_types
+from keystone.tests import test_content_types
 
 
 CONF = config.CONF

keystone/tests/test_v3_auth.py

@@ -20,8 +20,7 @@ from keystone.common import cms
 from keystone import config
 from keystone import exception
 from keystone import tests
-
-import test_v3
+from keystone.tests import test_v3
 
 
 CONF = config.CONF

keystone/tests/test_v3_catalog.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import test_v3
+from keystone.tests import test_v3
 
 
 class CatalogTestCase(test_v3.RestfulTestCase):

keystone/tests/test_v3_credential.py

@@ -18,7 +18,7 @@ import hashlib
 import json
 import uuid
 
-import test_v3
+from keystone.tests import test_v3
 
 
 class CredentialTestCase(test_v3.RestfulTestCase):

keystone/tests/test_v3_identity.py

@@ -17,8 +17,7 @@
 import uuid
 
 from keystone import exception
-
-import test_v3
+from keystone.tests import test_v3
 
 
 def _build_role_assignment_url_and_entity(

keystone/tests/test_v3_oauth1.py

@@ -26,8 +26,7 @@ from keystone import contrib
 from keystone.contrib import oauth1
 from keystone.contrib.oauth1 import controllers
 from keystone.openstack.common import importutils
-
-import test_v3
+from keystone.tests import test_v3
 
 
 CONF = config.CONF

keystone/tests/test_v3_policy.py

@@ -16,7 +16,7 @@
 
 import uuid
 
-import test_v3
+from keystone.tests import test_v3
 
 
 class PolicyTestCase(test_v3.RestfulTestCase):

keystone/tests/test_v3_protection.py

@@ -23,8 +23,7 @@ from keystone import exception
 from keystone.openstack.common import jsonutils
 from keystone.policy.backends import rules
 from keystone import tests
-
-import test_v3
+from keystone.tests import test_v3
 
 
 CONF = config.CONF