Revert "from tests import"
This reverts commit d8599dcda0
.
Change-Id: Iddb881070a91b9761a567a7d3b6d906e228af9f6
This commit is contained in:
parent
597fdb7798
commit
ceefe7f5fb
@ -20,8 +20,8 @@ from keystone import config
|
||||
from keystone.identity.backends import ldap as identity_ldap
|
||||
from keystone import test
|
||||
|
||||
from tests import default_fixtures
|
||||
from tests import test_backend_ldap
|
||||
import default_fixtures
|
||||
import test_backend_ldap
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
@ -26,7 +26,7 @@ from keystone import test
|
||||
from keystone import token
|
||||
from keystone import trust
|
||||
|
||||
from tests import default_fixtures
|
||||
import default_fixtures
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
@ -24,8 +24,8 @@ from keystone import test
|
||||
from keystone.token.backends import kvs as token_kvs
|
||||
from keystone.trust.backends import kvs as trust_kvs
|
||||
|
||||
from tests import default_fixtures
|
||||
from tests import test_backend
|
||||
import default_fixtures
|
||||
import test_backend
|
||||
|
||||
|
||||
class KvsIdentity(test.TestCase, test_backend.IdentityTests):
|
||||
|
@ -25,8 +25,8 @@ from keystone import exception
|
||||
from keystone import identity
|
||||
from keystone import test
|
||||
|
||||
from tests import default_fixtures
|
||||
from tests import test_backend
|
||||
import default_fixtures
|
||||
import test_backend
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
@ -23,7 +23,7 @@ from keystone.openstack.common import timeutils
|
||||
from keystone import test
|
||||
from keystone.token.backends import memcache as token_memcache
|
||||
|
||||
from tests import test_backend
|
||||
import test_backend
|
||||
|
||||
|
||||
class MemcacheClient(object):
|
||||
|
@ -27,8 +27,8 @@ from keystone import token
|
||||
from keystone import trust
|
||||
|
||||
|
||||
from tests import default_fixtures
|
||||
from tests import test_backend
|
||||
import default_fixtures
|
||||
import test_backend
|
||||
|
||||
CONF = config.CONF
|
||||
DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
|
||||
|
@ -21,8 +21,8 @@ from keystone.catalog.backends import templated as catalog_templated
|
||||
from keystone import exception
|
||||
from keystone import test
|
||||
|
||||
from tests import default_fixtures
|
||||
from tests import test_backend
|
||||
import default_fixtures
|
||||
import test_backend
|
||||
|
||||
DEFAULT_CATALOG_TEMPLATES = os.path.abspath(os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
|
@ -3,7 +3,7 @@ import uuid
|
||||
from keystone.common.sql import util as sql_util
|
||||
from keystone import test
|
||||
|
||||
from tests import test_content_types
|
||||
import test_content_types
|
||||
|
||||
|
||||
BASE_URL = 'http://127.0.0.1:35357/v2'
|
||||
|
@ -24,7 +24,7 @@ from keystone.common import serializer
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone import test
|
||||
|
||||
from tests import default_fixtures
|
||||
import default_fixtures
|
||||
|
||||
|
||||
class RestfulTestCase(test.TestCase):
|
||||
|
@ -25,7 +25,7 @@ from keystone.openstack.common import timeutils
|
||||
from keystone import config
|
||||
from keystone import test
|
||||
|
||||
from tests import default_fixtures
|
||||
import default_fixtures
|
||||
|
||||
CONF = config.CONF
|
||||
DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
|
||||
|
@ -22,7 +22,7 @@ from keystone.common import sql
|
||||
from keystone import config
|
||||
from keystone import test
|
||||
|
||||
from tests import test_keystoneclient
|
||||
import test_keystoneclient
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
@ -38,7 +38,7 @@ from keystone import config
|
||||
from keystone import exception
|
||||
from keystone import test
|
||||
|
||||
from tests import default_fixtures
|
||||
import default_fixtures
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
@ -11,7 +11,7 @@ from keystone.openstack.common import timeutils
|
||||
from keystone.policy.backends import rules
|
||||
from keystone import test
|
||||
|
||||
from tests import test_content_types
|
||||
import test_content_types
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
@ -23,7 +23,7 @@ from keystone import config
|
||||
from keystone import exception
|
||||
from keystone import test
|
||||
|
||||
from tests import test_v3
|
||||
import test_v3
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
@ -1,6 +1,6 @@
|
||||
import uuid
|
||||
|
||||
from tests import test_v3
|
||||
import test_v3
|
||||
|
||||
|
||||
class CatalogTestCase(test_v3.RestfulTestCase):
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
import uuid
|
||||
|
||||
from tests import test_v3
|
||||
import test_v3
|
||||
|
||||
|
||||
class IdentityTestCase(test_v3.RestfulTestCase):
|
||||
|
@ -1,6 +1,6 @@
|
||||
import uuid
|
||||
|
||||
from tests import test_v3
|
||||
import test_v3
|
||||
|
||||
|
||||
class PolicyTestCase(test_v3.RestfulTestCase):
|
||||
|
@ -24,7 +24,7 @@ import nose.exc
|
||||
from keystone import config
|
||||
from keystone.policy.backends import rules
|
||||
|
||||
from tests import test_v3
|
||||
import test_v3
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
@ -7,7 +7,7 @@ from keystone import config
|
||||
from keystone.common.sql import util as sql_util
|
||||
from keystone import test
|
||||
|
||||
from tests import test_content_types
|
||||
import test_content_types
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
Loading…
Reference in New Issue
Block a user