openstack/keystone
Code Issues Proposed changes

Revert "from tests import"

Browse Source 
This reverts commit d8599dcda06514a9687af3f714e55ff7580af9db.

Change-Id: Iddb881070a91b9761a567a7d3b6d906e228af9f6
This commit is contained in:
Adam Young 2013-03-11 14:40:35 -04:00
parent 597fdb7798
commit ceefe7f5fb
19 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/_ldap_livetest.py
View File

@ -20,8 +20,8 @@ from keystone import config
from keystone.identity.backends import ldap as identity_ldap from keystone.identity.backends import ldap as identity_ldap
from keystone import test from keystone import test
from tests import default_fixtures import default_fixtures
from tests import test_backend_ldap import test_backend_ldap
CONF = config.CONF CONF = config.CONF

2
tests/test_auth.py
View File

@ -26,7 +26,7 @@ from keystone import test
from keystone import token from keystone import token
from keystone import trust from keystone import trust
from tests import default_fixtures import default_fixtures
CONF = config.CONF CONF = config.CONF

4
tests/test_backend_kvs.py
View File

@ -24,8 +24,8 @@ from keystone import test
from keystone.token.backends import kvs as token_kvs from keystone.token.backends import kvs as token_kvs
from keystone.trust.backends import kvs as trust_kvs from keystone.trust.backends import kvs as trust_kvs
from tests import default_fixtures import default_fixtures
from tests import test_backend import test_backend
class KvsIdentity(test.TestCase, test_backend.IdentityTests): class KvsIdentity(test.TestCase, test_backend.IdentityTests):

4
tests/test_backend_ldap.py
View File

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

2
tests/test_backend_memcache.py
View File

@ -23,7 +23,7 @@ from keystone.openstack.common import timeutils
from keystone import test from keystone import test
from keystone.token.backends import memcache as token_memcache from keystone.token.backends import memcache as token_memcache
from tests import test_backend import test_backend
class MemcacheClient(object): class MemcacheClient(object):

4
tests/test_backend_sql.py
View File

@ -27,8 +27,8 @@ from keystone import token
from keystone import trust from keystone import trust
from tests import default_fixtures import default_fixtures
from tests import test_backend import test_backend
CONF = config.CONF CONF = config.CONF
DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id

4
tests/test_backend_templated.py
View File

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

2
tests/test_catalog.py
View File

@ -3,7 +3,7 @@ import uuid
from keystone.common.sql import util as sql_util from keystone.common.sql import util as sql_util
from keystone import test from keystone import test
from tests import test_content_types import test_content_types
BASE_URL = 'http://127.0.0.1:35357/v2' BASE_URL = 'http://127.0.0.1:35357/v2'

2
tests/test_content_types.py
View File

@ -24,7 +24,7 @@ from keystone.common import serializer
from keystone.openstack.common import jsonutils from keystone.openstack.common import jsonutils
from keystone import test from keystone import test
from tests import default_fixtures import default_fixtures
class RestfulTestCase(test.TestCase): class RestfulTestCase(test.TestCase):

2
tests/test_keystoneclient.py
View File

@ -25,7 +25,7 @@ from keystone.openstack.common import timeutils
from keystone import config from keystone import config
from keystone import test from keystone import test
from tests import default_fixtures import default_fixtures
CONF = config.CONF CONF = config.CONF
DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id

2
tests/test_keystoneclient_sql.py
View File

@ -22,7 +22,7 @@ from keystone.common import sql
from keystone import config from keystone import config
from keystone import test from keystone import test
from tests import test_keystoneclient import test_keystoneclient
CONF = config.CONF CONF = config.CONF

2
tests/test_sql_upgrade.py
View File

@ -38,7 +38,7 @@ from keystone import config
from keystone import exception from keystone import exception
from keystone import test from keystone import test
from tests import default_fixtures import default_fixtures
CONF = config.CONF CONF = config.CONF

2
tests/test_v3.py
View File

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

2
tests/test_v3_auth.py
View File

@ -23,7 +23,7 @@ from keystone import config
from keystone import exception from keystone import exception
from keystone import test from keystone import test
from tests import test_v3 import test_v3
CONF = config.CONF CONF = config.CONF

2
tests/test_v3_catalog.py
View File

@ -1,6 +1,6 @@
import uuid import uuid
from tests import test_v3 import test_v3
class CatalogTestCase(test_v3.RestfulTestCase): class CatalogTestCase(test_v3.RestfulTestCase):

2
tests/test_v3_identity.py
View File

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

2
tests/test_v3_policy.py
View File

@ -1,6 +1,6 @@
import uuid import uuid
from tests import test_v3 import test_v3
class PolicyTestCase(test_v3.RestfulTestCase): class PolicyTestCase(test_v3.RestfulTestCase):

2
tests/test_v3_protection.py
View File

@ -24,7 +24,7 @@ import nose.exc
from keystone import config from keystone import config
from keystone.policy.backends import rules from keystone.policy.backends import rules
from tests import test_v3 import test_v3
CONF = config.CONF CONF = config.CONF

2
tests/test_v3_trust.py
View File

@ -7,7 +7,7 @@ from keystone import config
from keystone.common.sql import util as sql_util from keystone.common.sql import util as sql_util
from keystone import test from keystone import test
from tests import test_content_types import test_content_types
CONF = config.CONF CONF = config.CONF