diff --git a/.testr.conf b/.testr.conf index 1c66bf6e96..7469895480 100644 --- a/.testr.conf +++ b/.testr.conf @@ -3,7 +3,7 @@ test_command= OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \ - ${PYTHON:-python} -m subunit.run discover -t ./ ./keystone/tests $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./keystone/tests/unit} $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/keystone/tests/__init__.py b/keystone/tests/__init__.py index 9355f92262..e69de29bb2 100644 --- a/keystone/tests/__init__.py +++ b/keystone/tests/__init__.py @@ -1,41 +0,0 @@ -# Copyright 2013 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import oslo_i18n -import six - - -if six.PY3: - # NOTE(dstanek): This block will monkey patch libraries that are not - # yet supported in Python3. We do this that that it is possible to - # execute any tests at all. Without monkey patching modules the - # tests will fail with import errors. - - import sys - from unittest import mock # noqa: our import detection is naive? - - sys.modules['eventlet'] = mock.Mock() - sys.modules['eventlet.green'] = mock.Mock() - sys.modules['eventlet.wsgi'] = mock.Mock() - sys.modules['oslo'].messaging = mock.Mock() - sys.modules['pycadf'] = mock.Mock() - sys.modules['paste'] = mock.Mock() - -# NOTE(dstanek): oslo_i18n.enable_lazy() must be called before -# keystone.i18n._() is called to ensure it has the desired lazy lookup -# behavior. This includes cases, like keystone.exceptions, where -# keystone.i18n._() is called at import time. -oslo_i18n.enable_lazy() - -from keystone.tests.core import * # noqa diff --git a/keystone/tests/unit/__init__.py b/keystone/tests/unit/__init__.py index e69de29bb2..c97ce25380 100644 --- a/keystone/tests/unit/__init__.py +++ b/keystone/tests/unit/__init__.py @@ -0,0 +1,41 @@ +# Copyright 2013 OpenStack Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import oslo_i18n +import six + + +if six.PY3: + # NOTE(dstanek): This block will monkey patch libraries that are not + # yet supported in Python3. We do this that that it is possible to + # execute any tests at all. Without monkey patching modules the + # tests will fail with import errors. + + import sys + from unittest import mock # noqa: our import detection is naive? + + sys.modules['eventlet'] = mock.Mock() + sys.modules['eventlet.green'] = mock.Mock() + sys.modules['eventlet.wsgi'] = mock.Mock() + sys.modules['oslo'].messaging = mock.Mock() + sys.modules['pycadf'] = mock.Mock() + sys.modules['paste'] = mock.Mock() + +# NOTE(dstanek): oslo_i18n.enable_lazy() must be called before +# keystone.i18n._() is called to ensure it has the desired lazy lookup +# behavior. This includes cases, like keystone.exceptions, where +# keystone.i18n._() is called at import time. +oslo_i18n.enable_lazy() + +from keystone.tests.unit.core import * # noqa diff --git a/keystone/tests/unit/common/test_base64utils.py b/keystone/tests/unit/common/test_base64utils.py index 738d10b759..cec401407d 100644 --- a/keystone/tests/unit/common/test_base64utils.py +++ b/keystone/tests/unit/common/test_base64utils.py @@ -13,7 +13,7 @@ # under the License. from keystone.common import base64utils -from keystone import tests +from keystone.tests import unit as tests base64_alphabet = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' diff --git a/keystone/tests/unit/common/test_connection_pool.py b/keystone/tests/unit/common/test_connection_pool.py index f7d6664316..74d0420ce0 100644 --- a/keystone/tests/unit/common/test_connection_pool.py +++ b/keystone/tests/unit/common/test_connection_pool.py @@ -19,7 +19,7 @@ from testtools import matchers from keystone.common.cache import _memcache_pool from keystone import exception -from keystone.tests import core +from keystone.tests.unit import core class _TestConnectionPool(_memcache_pool.ConnectionPool): diff --git a/keystone/tests/unit/common/test_injection.py b/keystone/tests/unit/common/test_injection.py index 1fdd143897..3f74c0c861 100644 --- a/keystone/tests/unit/common/test_injection.py +++ b/keystone/tests/unit/common/test_injection.py @@ -15,7 +15,7 @@ import uuid from keystone.common import dependency -from keystone import tests +from keystone.tests import unit as tests class TestDependencyInjection(tests.BaseTestCase): diff --git a/keystone/tests/unit/common/test_json_home.py b/keystone/tests/unit/common/test_json_home.py index 48c886ddd7..fb7f844850 100644 --- a/keystone/tests/unit/common/test_json_home.py +++ b/keystone/tests/unit/common/test_json_home.py @@ -18,7 +18,7 @@ import copy from testtools import matchers from keystone.common import json_home -from keystone import tests +from keystone.tests import unit as tests class JsonHomeTest(tests.BaseTestCase): diff --git a/keystone/tests/unit/common/test_ldap.py b/keystone/tests/unit/common/test_ldap.py index 1b3a6984a6..0ad96641f8 100644 --- a/keystone/tests/unit/common/test_ldap.py +++ b/keystone/tests/unit/common/test_ldap.py @@ -24,9 +24,9 @@ import tempfile from keystone.common import ldap as ks_ldap from keystone.common.ldap import core as common_ldap_core from keystone import config -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests import fakeldap +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit import fakeldap CONF = config.CONF diff --git a/keystone/tests/unit/common/test_notifications.py b/keystone/tests/unit/common/test_notifications.py index fb7ec3abf8..74dea8c40c 100644 --- a/keystone/tests/unit/common/test_notifications.py +++ b/keystone/tests/unit/common/test_notifications.py @@ -26,7 +26,7 @@ import testtools from keystone.common import dependency from keystone import notifications -from keystone.tests import test_v3 +from keystone.tests.unit import test_v3 CONF = cfg.CONF diff --git a/keystone/tests/unit/common/test_pemutils.py b/keystone/tests/unit/common/test_pemutils.py index 515c9e6838..dd00d9e220 100644 --- a/keystone/tests/unit/common/test_pemutils.py +++ b/keystone/tests/unit/common/test_pemutils.py @@ -17,7 +17,7 @@ import base64 from six import moves from keystone.common import pemutils -from keystone import tests +from keystone.tests import unit as tests # List of 2-tuples, (pem_type, pem_header) diff --git a/keystone/tests/unit/common/test_sql_core.py b/keystone/tests/unit/common/test_sql_core.py index d98c579784..1f33cfc391 100644 --- a/keystone/tests/unit/common/test_sql_core.py +++ b/keystone/tests/unit/common/test_sql_core.py @@ -14,8 +14,8 @@ from sqlalchemy.ext import declarative from keystone.common import sql -from keystone import tests -from keystone.tests import utils +from keystone.tests import unit as tests +from keystone.tests.unit import utils ModelBase = declarative.declarative_base() diff --git a/keystone/tests/unit/common/test_utils.py b/keystone/tests/unit/common/test_utils.py index 65dc1cbfbb..b6c0761c71 100644 --- a/keystone/tests/unit/common/test_utils.py +++ b/keystone/tests/unit/common/test_utils.py @@ -19,8 +19,8 @@ from keystone.common import utils as common_utils from keystone import config from keystone import exception from keystone import service -from keystone import tests -from keystone.tests import utils +from keystone.tests import unit as tests +from keystone.tests.unit import utils CONF = config.CONF diff --git a/keystone/tests/config_files/backend_db2.conf b/keystone/tests/unit/config_files/backend_db2.conf similarity index 100% rename from keystone/tests/config_files/backend_db2.conf rename to keystone/tests/unit/config_files/backend_db2.conf diff --git a/keystone/tests/config_files/backend_ldap.conf b/keystone/tests/unit/config_files/backend_ldap.conf similarity index 100% rename from keystone/tests/config_files/backend_ldap.conf rename to keystone/tests/unit/config_files/backend_ldap.conf diff --git a/keystone/tests/config_files/backend_ldap_pool.conf b/keystone/tests/unit/config_files/backend_ldap_pool.conf similarity index 100% rename from keystone/tests/config_files/backend_ldap_pool.conf rename to keystone/tests/unit/config_files/backend_ldap_pool.conf diff --git a/keystone/tests/config_files/backend_ldap_sql.conf b/keystone/tests/unit/config_files/backend_ldap_sql.conf similarity index 100% rename from keystone/tests/config_files/backend_ldap_sql.conf rename to keystone/tests/unit/config_files/backend_ldap_sql.conf diff --git a/keystone/tests/config_files/backend_liveldap.conf b/keystone/tests/unit/config_files/backend_liveldap.conf similarity index 100% rename from keystone/tests/config_files/backend_liveldap.conf rename to keystone/tests/unit/config_files/backend_liveldap.conf diff --git a/keystone/tests/config_files/backend_multi_ldap_sql.conf b/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf similarity index 100% rename from keystone/tests/config_files/backend_multi_ldap_sql.conf rename to keystone/tests/unit/config_files/backend_multi_ldap_sql.conf diff --git a/keystone/tests/config_files/backend_mysql.conf b/keystone/tests/unit/config_files/backend_mysql.conf similarity index 100% rename from keystone/tests/config_files/backend_mysql.conf rename to keystone/tests/unit/config_files/backend_mysql.conf diff --git a/keystone/tests/config_files/backend_pool_liveldap.conf b/keystone/tests/unit/config_files/backend_pool_liveldap.conf similarity index 100% rename from keystone/tests/config_files/backend_pool_liveldap.conf rename to keystone/tests/unit/config_files/backend_pool_liveldap.conf diff --git a/keystone/tests/config_files/backend_postgresql.conf b/keystone/tests/unit/config_files/backend_postgresql.conf similarity index 100% rename from keystone/tests/config_files/backend_postgresql.conf rename to keystone/tests/unit/config_files/backend_postgresql.conf diff --git a/keystone/tests/config_files/backend_sql.conf b/keystone/tests/unit/config_files/backend_sql.conf similarity index 100% rename from keystone/tests/config_files/backend_sql.conf rename to keystone/tests/unit/config_files/backend_sql.conf diff --git a/keystone/tests/config_files/backend_tls_liveldap.conf b/keystone/tests/unit/config_files/backend_tls_liveldap.conf similarity index 100% rename from keystone/tests/config_files/backend_tls_liveldap.conf rename to keystone/tests/unit/config_files/backend_tls_liveldap.conf diff --git a/keystone/tests/config_files/deprecated.conf b/keystone/tests/unit/config_files/deprecated.conf similarity index 100% rename from keystone/tests/config_files/deprecated.conf rename to keystone/tests/unit/config_files/deprecated.conf diff --git a/keystone/tests/config_files/deprecated_override.conf b/keystone/tests/unit/config_files/deprecated_override.conf similarity index 100% rename from keystone/tests/config_files/deprecated_override.conf rename to keystone/tests/unit/config_files/deprecated_override.conf diff --git a/keystone/tests/config_files/domain_configs_default_ldap_one_sql/keystone.domain1.conf b/keystone/tests/unit/config_files/domain_configs_default_ldap_one_sql/keystone.domain1.conf similarity index 100% rename from keystone/tests/config_files/domain_configs_default_ldap_one_sql/keystone.domain1.conf rename to keystone/tests/unit/config_files/domain_configs_default_ldap_one_sql/keystone.domain1.conf diff --git a/keystone/tests/config_files/domain_configs_multi_ldap/keystone.Default.conf b/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.Default.conf similarity index 100% rename from keystone/tests/config_files/domain_configs_multi_ldap/keystone.Default.conf rename to keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.Default.conf diff --git a/keystone/tests/config_files/domain_configs_multi_ldap/keystone.domain1.conf b/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain1.conf similarity index 100% rename from keystone/tests/config_files/domain_configs_multi_ldap/keystone.domain1.conf rename to keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain1.conf diff --git a/keystone/tests/config_files/domain_configs_multi_ldap/keystone.domain2.conf b/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain2.conf similarity index 100% rename from keystone/tests/config_files/domain_configs_multi_ldap/keystone.domain2.conf rename to keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain2.conf diff --git a/keystone/tests/config_files/domain_configs_one_extra_sql/keystone.domain2.conf b/keystone/tests/unit/config_files/domain_configs_one_extra_sql/keystone.domain2.conf similarity index 100% rename from keystone/tests/config_files/domain_configs_one_extra_sql/keystone.domain2.conf rename to keystone/tests/unit/config_files/domain_configs_one_extra_sql/keystone.domain2.conf diff --git a/keystone/tests/config_files/domain_configs_one_sql_one_ldap/keystone.Default.conf b/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.Default.conf similarity index 100% rename from keystone/tests/config_files/domain_configs_one_sql_one_ldap/keystone.Default.conf rename to keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.Default.conf diff --git a/keystone/tests/config_files/domain_configs_one_sql_one_ldap/keystone.domain1.conf b/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.domain1.conf similarity index 100% rename from keystone/tests/config_files/domain_configs_one_sql_one_ldap/keystone.domain1.conf rename to keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.domain1.conf diff --git a/keystone/tests/config_files/test_auth_plugin.conf b/keystone/tests/unit/config_files/test_auth_plugin.conf similarity index 71% rename from keystone/tests/config_files/test_auth_plugin.conf rename to keystone/tests/unit/config_files/test_auth_plugin.conf index 4b3117805d..abcc43badb 100644 --- a/keystone/tests/config_files/test_auth_plugin.conf +++ b/keystone/tests/unit/config_files/test_auth_plugin.conf @@ -1,6 +1,6 @@ [auth] methods = external,password,token,simple_challenge_response,saml2,openid,x509 -simple_challenge_response = keystone.tests.test_auth_plugin.SimpleChallengeResponse +simple_challenge_response = keystone.tests.unit.test_auth_plugin.SimpleChallengeResponse saml2 = keystone.auth.plugins.mapped.Mapped openid = keystone.auth.plugins.mapped.Mapped x509 = keystone.auth.plugins.mapped.Mapped diff --git a/keystone/tests/core.py b/keystone/tests/unit/core.py similarity index 98% rename from keystone/tests/core.py rename to keystone/tests/unit/core.py index d15213a9f2..261df9615b 100644 --- a/keystone/tests/core.py +++ b/keystone/tests/unit/core.py @@ -53,8 +53,8 @@ from keystone import notifications from keystone.openstack.common import log from keystone.server import common from keystone import service -from keystone.tests import ksfixtures -from keystone.tests import utils +from keystone.tests.unit import ksfixtures +from keystone.tests.unit import utils # NOTE(dstanek): Tests inheriting from TestCase depend on having the @@ -69,7 +69,7 @@ LOG = log.getLogger(__name__) PID = six.text_type(os.getpid()) TESTSDIR = os.path.dirname(os.path.abspath(__file__)) TESTCONF = os.path.join(TESTSDIR, 'config_files') -ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..', '..')) +ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..', '..', '..')) VENDOR = os.path.join(ROOTDIR, 'vendor') ETCDIR = os.path.join(ROOTDIR, 'etc') @@ -312,7 +312,7 @@ class TestCase(BaseTestCase): group='cache', backend='dogpile.cache.memory', enabled=True, - proxies=['keystone.tests.test_cache.CacheIsolatingProxy']) + proxies=['keystone.tests.unit.test_cache.CacheIsolatingProxy']) self.config_fixture.config( group='catalog', driver='keystone.catalog.backends.templated.Catalog', @@ -323,8 +323,9 @@ class TestCase(BaseTestCase): self.config_fixture.config( group='kvs', backends=[ - 'keystone.tests.test_kvs.KVSBackendForcedKeyMangleFixture', - 'keystone.tests.test_kvs.KVSBackendFixture']) + ('keystone.tests.unit.test_kvs.' + 'KVSBackendForcedKeyMangleFixture'), + 'keystone.tests.unit.test_kvs.KVSBackendFixture']) self.config_fixture.config( group='revoke', driver='keystone.contrib.revoke.backends.kvs.Revoke') diff --git a/keystone/tests/default_catalog.templates b/keystone/tests/unit/default_catalog.templates similarity index 100% rename from keystone/tests/default_catalog.templates rename to keystone/tests/unit/default_catalog.templates diff --git a/keystone/tests/default_fixtures.py b/keystone/tests/unit/default_fixtures.py similarity index 100% rename from keystone/tests/default_fixtures.py rename to keystone/tests/unit/default_fixtures.py diff --git a/keystone/tests/fakeldap.py b/keystone/tests/unit/fakeldap.py similarity index 100% rename from keystone/tests/fakeldap.py rename to keystone/tests/unit/fakeldap.py diff --git a/keystone/tests/federation_fixtures.py b/keystone/tests/unit/federation_fixtures.py similarity index 100% rename from keystone/tests/federation_fixtures.py rename to keystone/tests/unit/federation_fixtures.py diff --git a/keystone/tests/filtering.py b/keystone/tests/unit/filtering.py similarity index 100% rename from keystone/tests/filtering.py rename to keystone/tests/unit/filtering.py diff --git a/keystone/tests/unit/identity/test_core.py b/keystone/tests/unit/identity/test_core.py index 8905939c69..b77d7b8b5d 100644 --- a/keystone/tests/unit/identity/test_core.py +++ b/keystone/tests/unit/identity/test_core.py @@ -20,7 +20,7 @@ import mock from keystone import config from keystone import exception from keystone import identity -from keystone import tests +from keystone.tests import unit as tests CONF = config.CONF diff --git a/keystone/tests/identity_mapping.py b/keystone/tests/unit/identity_mapping.py similarity index 100% rename from keystone/tests/identity_mapping.py rename to keystone/tests/unit/identity_mapping.py diff --git a/keystone/tests/ksfixtures/__init__.py b/keystone/tests/unit/ksfixtures/__init__.py similarity index 89% rename from keystone/tests/ksfixtures/__init__.py rename to keystone/tests/unit/ksfixtures/__init__.py index 04420ed8ca..c0846cc8c2 100644 --- a/keystone/tests/ksfixtures/__init__.py +++ b/keystone/tests/unit/ksfixtures/__init__.py @@ -11,4 +11,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -from keystone.tests.ksfixtures.cache import Cache # noqa +from keystone.tests.unit.ksfixtures.cache import Cache # noqa diff --git a/keystone/tests/ksfixtures/appserver.py b/keystone/tests/unit/ksfixtures/appserver.py similarity index 100% rename from keystone/tests/ksfixtures/appserver.py rename to keystone/tests/unit/ksfixtures/appserver.py diff --git a/keystone/tests/ksfixtures/cache.py b/keystone/tests/unit/ksfixtures/cache.py similarity index 100% rename from keystone/tests/ksfixtures/cache.py rename to keystone/tests/unit/ksfixtures/cache.py diff --git a/keystone/tests/ksfixtures/database.py b/keystone/tests/unit/ksfixtures/database.py similarity index 97% rename from keystone/tests/ksfixtures/database.py rename to keystone/tests/unit/ksfixtures/database.py index 4633612189..ff894b971b 100644 --- a/keystone/tests/ksfixtures/database.py +++ b/keystone/tests/unit/ksfixtures/database.py @@ -22,7 +22,7 @@ from oslo_db.sqlalchemy import migration from keystone.common import sql from keystone.common.sql import migration_helpers from keystone import config -from keystone import tests +from keystone.tests import unit as tests CONF = config.CONF @@ -88,7 +88,7 @@ def _load_sqlalchemy_models(): """ keystone_root = os.path.normpath(os.path.join( - os.path.dirname(__file__), '..', '..')) + os.path.dirname(__file__), '..', '..', '..')) for root, dirs, files in os.walk(keystone_root): # NOTE(morganfainberg): Slice the keystone_root off the root to ensure # we do not end up with a module name like: diff --git a/keystone/tests/ksfixtures/hacking.py b/keystone/tests/unit/ksfixtures/hacking.py similarity index 100% rename from keystone/tests/ksfixtures/hacking.py rename to keystone/tests/unit/ksfixtures/hacking.py diff --git a/keystone/tests/ksfixtures/temporaryfile.py b/keystone/tests/unit/ksfixtures/temporaryfile.py similarity index 100% rename from keystone/tests/ksfixtures/temporaryfile.py rename to keystone/tests/unit/ksfixtures/temporaryfile.py diff --git a/keystone/tests/mapping_fixtures.py b/keystone/tests/unit/mapping_fixtures.py similarity index 100% rename from keystone/tests/mapping_fixtures.py rename to keystone/tests/unit/mapping_fixtures.py diff --git a/keystone/tests/rest.py b/keystone/tests/unit/rest.py similarity index 98% rename from keystone/tests/rest.py rename to keystone/tests/unit/rest.py index 7d945a06a7..d9dfbe92aa 100644 --- a/keystone/tests/rest.py +++ b/keystone/tests/unit/rest.py @@ -20,9 +20,9 @@ import six import webtest from keystone.auth import controllers as auth_controllers -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests.ksfixtures import database +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit.ksfixtures import database class RestfulTestCase(tests.TestCase): diff --git a/keystone/tests/saml2/idp_saml2_metadata.xml b/keystone/tests/unit/saml2/idp_saml2_metadata.xml similarity index 100% rename from keystone/tests/saml2/idp_saml2_metadata.xml rename to keystone/tests/unit/saml2/idp_saml2_metadata.xml diff --git a/keystone/tests/saml2/signed_saml2_assertion.xml b/keystone/tests/unit/saml2/signed_saml2_assertion.xml similarity index 100% rename from keystone/tests/saml2/signed_saml2_assertion.xml rename to keystone/tests/unit/saml2/signed_saml2_assertion.xml diff --git a/keystone/tests/test_associate_project_endpoint_extension.py b/keystone/tests/unit/test_associate_project_endpoint_extension.py similarity index 99% rename from keystone/tests/test_associate_project_endpoint_extension.py rename to keystone/tests/unit/test_associate_project_endpoint_extension.py index a4cff43cc8..af084a2a9f 100644 --- a/keystone/tests/test_associate_project_endpoint_extension.py +++ b/keystone/tests/unit/test_associate_project_endpoint_extension.py @@ -19,7 +19,7 @@ from testtools import matchers # NOTE(morganfainberg): import endpoint filter to populate the SQL model from keystone.contrib import endpoint_filter # noqa -from keystone.tests import test_v3 +from keystone.tests.unit import test_v3 class TestExtensionCase(test_v3.RestfulTestCase): diff --git a/keystone/tests/test_auth.py b/keystone/tests/unit/test_auth.py similarity index 99% rename from keystone/tests/test_auth.py rename to keystone/tests/unit/test_auth.py index 04d9490b4e..e356d31ee8 100644 --- a/keystone/tests/test_auth.py +++ b/keystone/tests/unit/test_auth.py @@ -27,9 +27,9 @@ from keystone import config from keystone.contrib import revoke from keystone import exception from keystone.models import token_model -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests.ksfixtures import database +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit.ksfixtures import database from keystone import token from keystone.token import provider from keystone import trust diff --git a/keystone/tests/test_auth_plugin.py b/keystone/tests/unit/test_auth_plugin.py similarity index 95% rename from keystone/tests/test_auth_plugin.py rename to keystone/tests/unit/test_auth_plugin.py index 732aa5fbdb..cd3cf30968 100644 --- a/keystone/tests/test_auth_plugin.py +++ b/keystone/tests/unit/test_auth_plugin.py @@ -18,7 +18,7 @@ import mock from keystone import auth from keystone import exception -from keystone import tests +from keystone.tests import unit as tests # for testing purposes only @@ -69,7 +69,8 @@ class TestAuthPlugin(tests.SQLDriverOverrides, tests.TestCase): ('password', 'keystone.auth.plugins.password.Password'), ('token', 'keystone.auth.plugins.token.Token'), (METHOD_NAME, - 'keystone.tests.test_auth_plugin.SimpleChallengeResponse'), + 'keystone.tests.unit.test_auth_plugin.' + 'SimpleChallengeResponse'), ]) self.auth_plugin_config_override( methods=['external', 'password', 'token', METHOD_NAME], @@ -142,15 +143,16 @@ class TestInvalidAuthMethodRegistration(tests.TestCase): self.config_fixture.config( group='auth', methods=[ - 'keystone.tests.test_auth_plugin.SimpleChallengeResponse', - 'keystone.tests.test_auth_plugin.DuplicateAuthPlugin']) + 'keystone.tests.unit.test_auth_plugin.SimpleChallengeResponse', + 'keystone.tests.unit.test_auth_plugin.DuplicateAuthPlugin']) self.clear_auth_plugin_registry() self.assertRaises(ValueError, auth.controllers.load_auth_methods) def test_no_method_attribute_auth_method_by_class_name_registration(self): self.config_fixture.config( group='auth', - methods=['keystone.tests.test_auth_plugin.NoMethodAuthPlugin']) + methods=['keystone.tests.unit.test_auth_plugin.NoMethodAuthPlugin'] + ) self.clear_auth_plugin_registry() self.assertRaises(ValueError, auth.controllers.load_auth_methods) diff --git a/keystone/tests/test_backend.py b/keystone/tests/unit/test_backend.py similarity index 99% rename from keystone/tests/test_backend.py rename to keystone/tests/unit/test_backend.py index 883ad39f4e..383ebf438a 100644 --- a/keystone/tests/test_backend.py +++ b/keystone/tests/unit/test_backend.py @@ -27,10 +27,10 @@ from keystone.catalog import core from keystone.common import driver_hints from keystone import config from keystone import exception -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests import filtering -from keystone.tests import utils as test_utils +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit import filtering +from keystone.tests.unit import utils as test_utils from keystone.token import provider diff --git a/keystone/tests/test_backend_endpoint_policy.py b/keystone/tests/unit/test_backend_endpoint_policy.py similarity index 100% rename from keystone/tests/test_backend_endpoint_policy.py rename to keystone/tests/unit/test_backend_endpoint_policy.py diff --git a/keystone/tests/test_backend_endpoint_policy_sql.py b/keystone/tests/unit/test_backend_endpoint_policy_sql.py similarity index 92% rename from keystone/tests/test_backend_endpoint_policy_sql.py rename to keystone/tests/unit/test_backend_endpoint_policy_sql.py index 5937d4ce07..dab02859d0 100644 --- a/keystone/tests/test_backend_endpoint_policy_sql.py +++ b/keystone/tests/unit/test_backend_endpoint_policy_sql.py @@ -13,8 +13,8 @@ # under the License. from keystone.common import sql -from keystone.tests import test_backend_endpoint_policy -from keystone.tests import test_backend_sql +from keystone.tests.unit import test_backend_endpoint_policy +from keystone.tests.unit import test_backend_sql class SqlPolicyAssociationTable(test_backend_sql.SqlModels): diff --git a/keystone/tests/test_backend_federation_sql.py b/keystone/tests/unit/test_backend_federation_sql.py similarity index 97% rename from keystone/tests/test_backend_federation_sql.py rename to keystone/tests/unit/test_backend_federation_sql.py index 0f6b3d3f63..48ebad6c5f 100644 --- a/keystone/tests/test_backend_federation_sql.py +++ b/keystone/tests/unit/test_backend_federation_sql.py @@ -13,7 +13,7 @@ # under the License. from keystone.common import sql -from keystone.tests import test_backend_sql +from keystone.tests.unit import test_backend_sql class SqlFederation(test_backend_sql.SqlModels): diff --git a/keystone/tests/test_backend_id_mapping_sql.py b/keystone/tests/unit/test_backend_id_mapping_sql.py similarity index 98% rename from keystone/tests/test_backend_id_mapping_sql.py rename to keystone/tests/unit/test_backend_id_mapping_sql.py index d87ff7c92e..6b691e5a2a 100644 --- a/keystone/tests/test_backend_id_mapping_sql.py +++ b/keystone/tests/unit/test_backend_id_mapping_sql.py @@ -19,8 +19,8 @@ from testtools import matchers from keystone.common import sql from keystone.identity.mapping_backends import mapping -from keystone.tests import identity_mapping as mapping_sql -from keystone.tests import test_backend_sql +from keystone.tests.unit import identity_mapping as mapping_sql +from keystone.tests.unit import test_backend_sql class SqlIDMappingTable(test_backend_sql.SqlModels): diff --git a/keystone/tests/test_backend_kvs.py b/keystone/tests/unit/test_backend_kvs.py similarity index 98% rename from keystone/tests/test_backend_kvs.py rename to keystone/tests/unit/test_backend_kvs.py index 687241dce8..32c04a4c54 100644 --- a/keystone/tests/test_backend_kvs.py +++ b/keystone/tests/unit/test_backend_kvs.py @@ -19,8 +19,8 @@ import six from keystone import config from keystone import exception -from keystone import tests -from keystone.tests import test_backend +from keystone.tests import unit as tests +from keystone.tests.unit import test_backend CONF = config.CONF diff --git a/keystone/tests/test_backend_ldap.py b/keystone/tests/unit/test_backend_ldap.py similarity index 99% rename from keystone/tests/test_backend_ldap.py rename to keystone/tests/unit/test_backend_ldap.py index cf67471b90..00abd089ab 100644 --- a/keystone/tests/test_backend_ldap.py +++ b/keystone/tests/unit/test_backend_ldap.py @@ -30,12 +30,12 @@ from keystone import exception from keystone import identity from keystone.identity.mapping_backends import mapping as map from keystone import resource -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests import fakeldap -from keystone.tests import identity_mapping as mapping_sql -from keystone.tests.ksfixtures import database -from keystone.tests import test_backend +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit import fakeldap +from keystone.tests.unit import identity_mapping as mapping_sql +from keystone.tests.unit.ksfixtures import database +from keystone.tests.unit import test_backend CONF = config.CONF diff --git a/keystone/tests/test_backend_ldap_pool.py b/keystone/tests/unit/test_backend_ldap_pool.py similarity index 98% rename from keystone/tests/test_backend_ldap_pool.py rename to keystone/tests/unit/test_backend_ldap_pool.py index e0def853c6..048fc9348f 100644 --- a/keystone/tests/test_backend_ldap_pool.py +++ b/keystone/tests/unit/test_backend_ldap_pool.py @@ -21,9 +21,9 @@ from oslotest import mockpatch from keystone.common.ldap import core as ldap_core from keystone import config from keystone.identity.backends import ldap -from keystone import tests -from keystone.tests import fakeldap -from keystone.tests import test_backend_ldap +from keystone.tests import unit as tests +from keystone.tests.unit import fakeldap +from keystone.tests.unit import test_backend_ldap CONF = config.CONF diff --git a/keystone/tests/test_backend_rules.py b/keystone/tests/unit/test_backend_rules.py similarity index 96% rename from keystone/tests/test_backend_rules.py rename to keystone/tests/unit/test_backend_rules.py index 00caa41912..c9c4f151eb 100644 --- a/keystone/tests/test_backend_rules.py +++ b/keystone/tests/unit/test_backend_rules.py @@ -14,8 +14,8 @@ from keystone import exception -from keystone import tests -from keystone.tests import test_backend +from keystone.tests import unit as tests +from keystone.tests.unit import test_backend class RulesPolicy(tests.TestCase, test_backend.PolicyTests): diff --git a/keystone/tests/test_backend_sql.py b/keystone/tests/unit/test_backend_sql.py similarity index 99% rename from keystone/tests/test_backend_sql.py rename to keystone/tests/unit/test_backend_sql.py index 07e645c744..8d4cea40a2 100644 --- a/keystone/tests/test_backend_sql.py +++ b/keystone/tests/unit/test_backend_sql.py @@ -29,10 +29,10 @@ from keystone import config from keystone import exception from keystone.identity.backends import sql as identity_sql from keystone.openstack.common import versionutils -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests.ksfixtures import database -from keystone.tests import test_backend +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit.ksfixtures import database +from keystone.tests.unit import test_backend from keystone.token.persistence.backends import sql as token_sql diff --git a/keystone/tests/test_backend_templated.py b/keystone/tests/unit/test_backend_templated.py similarity index 96% rename from keystone/tests/test_backend_templated.py rename to keystone/tests/unit/test_backend_templated.py index 6e0498dfd3..4d679a35e8 100644 --- a/keystone/tests/test_backend_templated.py +++ b/keystone/tests/unit/test_backend_templated.py @@ -15,10 +15,10 @@ import os import uuid -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests.ksfixtures import database -from keystone.tests import test_backend +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit.ksfixtures import database +from keystone.tests.unit import test_backend DEFAULT_CATALOG_TEMPLATES = os.path.abspath(os.path.join( diff --git a/keystone/tests/test_cache.py b/keystone/tests/unit/test_cache.py similarity index 99% rename from keystone/tests/test_cache.py rename to keystone/tests/unit/test_cache.py index cf81df8288..b3223c8152 100644 --- a/keystone/tests/test_cache.py +++ b/keystone/tests/unit/test_cache.py @@ -20,7 +20,7 @@ from dogpile.cache import proxy from keystone.common import cache from keystone import config from keystone import exception -from keystone import tests +from keystone.tests import unit as tests CONF = config.CONF diff --git a/keystone/tests/test_cache_backend_mongo.py b/keystone/tests/unit/test_cache_backend_mongo.py similarity index 99% rename from keystone/tests/test_cache_backend_mongo.py rename to keystone/tests/unit/test_cache_backend_mongo.py index bd52f1d5f3..639dc1b12a 100644 --- a/keystone/tests/test_cache_backend_mongo.py +++ b/keystone/tests/unit/test_cache_backend_mongo.py @@ -23,7 +23,7 @@ import six from keystone.common.cache.backends import mongo from keystone import exception -from keystone import tests +from keystone.tests import unit as tests # Mock database structure sample where 'ks_cache' is database and diff --git a/keystone/tests/test_catalog.py b/keystone/tests/unit/test_catalog.py similarity index 98% rename from keystone/tests/test_catalog.py rename to keystone/tests/unit/test_catalog.py index 818c253e57..a9e954a305 100644 --- a/keystone/tests/test_catalog.py +++ b/keystone/tests/unit/test_catalog.py @@ -17,9 +17,9 @@ import uuid import six from keystone import catalog -from keystone import tests -from keystone.tests.ksfixtures import database -from keystone.tests import rest +from keystone.tests import unit as tests +from keystone.tests.unit.ksfixtures import database +from keystone.tests.unit import rest BASE_URL = 'http://127.0.0.1:35357/v2' diff --git a/keystone/tests/test_cert_setup.py b/keystone/tests/unit/test_cert_setup.py similarity index 99% rename from keystone/tests/test_cert_setup.py rename to keystone/tests/unit/test_cert_setup.py index 57d47508a0..285aaaf5de 100644 --- a/keystone/tests/test_cert_setup.py +++ b/keystone/tests/unit/test_cert_setup.py @@ -22,8 +22,8 @@ from testtools import matchers from keystone.common import environment from keystone.common import openssl from keystone import exception -from keystone import tests -from keystone.tests import rest +from keystone.tests import unit as tests +from keystone.tests.unit import rest from keystone import token diff --git a/keystone/tests/test_cli.py b/keystone/tests/unit/test_cli.py similarity index 91% rename from keystone/tests/test_cli.py rename to keystone/tests/unit/test_cli.py index 002f820ec2..2995279de1 100644 --- a/keystone/tests/test_cli.py +++ b/keystone/tests/unit/test_cli.py @@ -13,8 +13,8 @@ # under the License. from keystone import cli -from keystone import tests -from keystone.tests.ksfixtures import database +from keystone.tests import unit as tests +from keystone.tests.unit.ksfixtures import database class CliTestCase(tests.SQLDriverOverrides, tests.TestCase): diff --git a/keystone/tests/test_config.py b/keystone/tests/unit/test_config.py similarity index 98% rename from keystone/tests/test_config.py rename to keystone/tests/unit/test_config.py index fe6e9a3e41..7bb935e86e 100644 --- a/keystone/tests/test_config.py +++ b/keystone/tests/unit/test_config.py @@ -16,7 +16,7 @@ import uuid from keystone import config from keystone import exception -from keystone import tests +from keystone.tests import unit as tests CONF = config.CONF diff --git a/keystone/tests/test_content_types.py b/keystone/tests/unit/test_content_types.py similarity index 99% rename from keystone/tests/test_content_types.py rename to keystone/tests/unit/test_content_types.py index 5dd74df4b2..9c4957ff5c 100644 --- a/keystone/tests/test_content_types.py +++ b/keystone/tests/unit/test_content_types.py @@ -23,7 +23,7 @@ from testtools import matchers from keystone.common import extension as keystone_extension from keystone import config from keystone.contrib import revoke -from keystone.tests import rest +from keystone.tests.unit import rest CONF = config.CONF diff --git a/keystone/tests/test_contrib_s3_core.py b/keystone/tests/unit/test_contrib_s3_core.py similarity index 98% rename from keystone/tests/test_contrib_s3_core.py rename to keystone/tests/unit/test_contrib_s3_core.py index 8d3c561292..43ea1ac5bc 100644 --- a/keystone/tests/test_contrib_s3_core.py +++ b/keystone/tests/unit/test_contrib_s3_core.py @@ -16,7 +16,7 @@ import uuid from keystone.contrib import s3 from keystone import exception -from keystone import tests +from keystone.tests import unit as tests class S3ContribCore(tests.TestCase): diff --git a/keystone/tests/test_contrib_simple_cert.py b/keystone/tests/unit/test_contrib_simple_cert.py similarity index 97% rename from keystone/tests/test_contrib_simple_cert.py rename to keystone/tests/unit/test_contrib_simple_cert.py index 98d6360a7c..8664e2c3eb 100644 --- a/keystone/tests/test_contrib_simple_cert.py +++ b/keystone/tests/unit/test_contrib_simple_cert.py @@ -12,7 +12,7 @@ import uuid -from keystone.tests import test_v3 +from keystone.tests.unit import test_v3 class BaseTestCase(test_v3.RestfulTestCase): diff --git a/keystone/tests/unit/test_core.py b/keystone/tests/unit/test_core.py index eaf372c47b..070a96b86c 100644 --- a/keystone/tests/unit/test_core.py +++ b/keystone/tests/unit/test_core.py @@ -19,7 +19,7 @@ from sqlalchemy import exc from testtools import matchers from keystone.openstack.common import log -from keystone import tests +from keystone.tests import unit as tests LOG = log.getLogger(__name__) diff --git a/keystone/tests/test_driver_hints.py b/keystone/tests/unit/test_driver_hints.py similarity index 98% rename from keystone/tests/test_driver_hints.py rename to keystone/tests/unit/test_driver_hints.py index d06c012208..c20d2ae75e 100644 --- a/keystone/tests/test_driver_hints.py +++ b/keystone/tests/unit/test_driver_hints.py @@ -13,7 +13,7 @@ # under the License. from keystone.common import driver_hints -from keystone.tests import core as test +from keystone.tests.unit import core as test class ListHintsTests(test.TestCase): diff --git a/keystone/tests/test_ec2_token_middleware.py b/keystone/tests/unit/test_ec2_token_middleware.py similarity index 97% rename from keystone/tests/test_ec2_token_middleware.py rename to keystone/tests/unit/test_ec2_token_middleware.py index 10b51fa021..03c95e278f 100644 --- a/keystone/tests/test_ec2_token_middleware.py +++ b/keystone/tests/unit/test_ec2_token_middleware.py @@ -13,7 +13,7 @@ from keystonemiddleware import ec2_token as ksm_ec2_token from keystone.middleware import ec2_token -from keystone import tests +from keystone.tests import unit as tests class EC2TokenMiddlewareTestBase(tests.BaseTestCase): diff --git a/keystone/tests/test_exception.py b/keystone/tests/unit/test_exception.py similarity index 99% rename from keystone/tests/test_exception.py rename to keystone/tests/unit/test_exception.py index f5c6fa3559..f056eed5d8 100644 --- a/keystone/tests/test_exception.py +++ b/keystone/tests/unit/test_exception.py @@ -19,7 +19,7 @@ import six from keystone.common import wsgi from keystone import exception -from keystone import tests +from keystone.tests import unit as tests class ExceptionTestCase(tests.TestCase): diff --git a/keystone/tests/unit/test_hacking_checks.py b/keystone/tests/unit/test_hacking_checks.py index 89cb231e54..730ec74e2f 100644 --- a/keystone/tests/unit/test_hacking_checks.py +++ b/keystone/tests/unit/test_hacking_checks.py @@ -17,7 +17,7 @@ import pep8 import testtools from keystone.hacking import checks -from keystone.tests.ksfixtures import hacking as hacking_fixtures +from keystone.tests.unit.ksfixtures import hacking as hacking_fixtures class BaseStyleCheck(testtools.TestCase): diff --git a/keystone/tests/test_ipv6.py b/keystone/tests/unit/test_ipv6.py similarity index 94% rename from keystone/tests/test_ipv6.py rename to keystone/tests/unit/test_ipv6.py index 832c6ee87b..750c6680a8 100644 --- a/keystone/tests/test_ipv6.py +++ b/keystone/tests/unit/test_ipv6.py @@ -15,8 +15,8 @@ from keystone.common import environment from keystone import config -from keystone import tests -from keystone.tests.ksfixtures import appserver +from keystone.tests import unit as tests +from keystone.tests.unit.ksfixtures import appserver CONF = config.CONF diff --git a/keystone/tests/test_keystoneclient.py b/keystone/tests/unit/test_keystoneclient.py similarity index 99% rename from keystone/tests/test_keystoneclient.py rename to keystone/tests/unit/test_keystoneclient.py index e1924c5a90..a6fa57214e 100644 --- a/keystone/tests/test_keystoneclient.py +++ b/keystone/tests/unit/test_keystoneclient.py @@ -23,10 +23,10 @@ from oslo_utils import timeutils import webob from keystone import config -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests.ksfixtures import appserver -from keystone.tests.ksfixtures import database +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit.ksfixtures import appserver +from keystone.tests.unit.ksfixtures import database CONF = config.CONF diff --git a/keystone/tests/test_keystoneclient_sql.py b/keystone/tests/unit/test_keystoneclient_sql.py similarity index 99% rename from keystone/tests/test_keystoneclient_sql.py rename to keystone/tests/unit/test_keystoneclient_sql.py index 8142533a39..84eaad32a7 100644 --- a/keystone/tests/test_keystoneclient_sql.py +++ b/keystone/tests/unit/test_keystoneclient_sql.py @@ -17,8 +17,8 @@ import uuid from keystoneclient.contrib.ec2 import utils as ec2_utils from keystoneclient import exceptions as client_exceptions -from keystone import tests -from keystone.tests import test_keystoneclient +from keystone.tests import unit as tests +from keystone.tests.unit import test_keystoneclient class ClientDrivenSqlTestCase(test_keystoneclient.ClientDrivenTestCase): diff --git a/keystone/tests/test_kvs.py b/keystone/tests/unit/test_kvs.py similarity index 99% rename from keystone/tests/test_kvs.py rename to keystone/tests/unit/test_kvs.py index faebdc3e8f..bb4e6229a2 100644 --- a/keystone/tests/test_kvs.py +++ b/keystone/tests/unit/test_kvs.py @@ -26,7 +26,7 @@ from keystone.common.kvs.backends import inmemdb from keystone.common.kvs.backends import memcached from keystone.common.kvs import core from keystone import exception -from keystone import tests +from keystone.tests import unit as tests NO_VALUE = api.NO_VALUE @@ -189,8 +189,8 @@ class KVSTest(tests.TestCase): kvs = self._get_kvs_region() kvs.configure( 'openstack.kvs.Memory', - proxy_list=['keystone.tests.test_kvs.RegionProxyFixture', - 'keystone.tests.test_kvs.RegionProxy2Fixture']) + proxy_list=['keystone.tests.unit.test_kvs.RegionProxyFixture', + 'keystone.tests.unit.test_kvs.RegionProxy2Fixture']) self.assertIsInstance(kvs._region.backend, RegionProxyFixture) self.assertIsInstance(kvs._region.backend.proxied, RegionProxy2Fixture) diff --git a/keystone/tests/test_ldap_livetest.py b/keystone/tests/unit/test_ldap_livetest.py similarity index 98% rename from keystone/tests/test_ldap_livetest.py rename to keystone/tests/unit/test_ldap_livetest.py index a8db5a0868..3a22562e8c 100644 --- a/keystone/tests/test_ldap_livetest.py +++ b/keystone/tests/unit/test_ldap_livetest.py @@ -21,8 +21,8 @@ import ldap.modlist from keystone import config from keystone import exception from keystone.identity.backends import ldap as identity_ldap -from keystone import tests -from keystone.tests import test_backend_ldap +from keystone.tests import unit as tests +from keystone.tests.unit import test_backend_ldap CONF = config.CONF diff --git a/keystone/tests/test_ldap_pool_livetest.py b/keystone/tests/unit/test_ldap_pool_livetest.py similarity index 97% rename from keystone/tests/test_ldap_pool_livetest.py rename to keystone/tests/unit/test_ldap_pool_livetest.py index 534fdf4a50..ae2bbe6b7b 100644 --- a/keystone/tests/test_ldap_pool_livetest.py +++ b/keystone/tests/unit/test_ldap_pool_livetest.py @@ -19,10 +19,10 @@ import ldappool from keystone.common.ldap import core as ldap_core from keystone import config from keystone.identity.backends import ldap -from keystone import tests -from keystone.tests import fakeldap -from keystone.tests import test_backend_ldap_pool -from keystone.tests import test_ldap_livetest +from keystone.tests import unit as tests +from keystone.tests.unit import fakeldap +from keystone.tests.unit import test_backend_ldap_pool +from keystone.tests.unit import test_ldap_livetest CONF = config.CONF diff --git a/keystone/tests/test_ldap_tls_livetest.py b/keystone/tests/unit/test_ldap_tls_livetest.py similarity index 97% rename from keystone/tests/test_ldap_tls_livetest.py rename to keystone/tests/unit/test_ldap_tls_livetest.py index 89add00a3a..01e3ed01f3 100644 --- a/keystone/tests/test_ldap_tls_livetest.py +++ b/keystone/tests/unit/test_ldap_tls_livetest.py @@ -19,8 +19,8 @@ import ldap.modlist from keystone import config from keystone import exception from keystone import identity -from keystone import tests -from keystone.tests import test_ldap_livetest +from keystone.tests import unit as tests +from keystone.tests.unit import test_ldap_livetest CONF = config.CONF diff --git a/keystone/tests/test_middleware.py b/keystone/tests/unit/test_middleware.py similarity index 99% rename from keystone/tests/test_middleware.py rename to keystone/tests/unit/test_middleware.py index 0bfed7ff5e..7aa1077142 100644 --- a/keystone/tests/test_middleware.py +++ b/keystone/tests/unit/test_middleware.py @@ -16,7 +16,7 @@ import webob from keystone import config from keystone import middleware -from keystone import tests +from keystone.tests import unit as tests CONF = config.CONF diff --git a/keystone/tests/test_no_admin_token_auth.py b/keystone/tests/unit/test_no_admin_token_auth.py similarity index 98% rename from keystone/tests/test_no_admin_token_auth.py rename to keystone/tests/unit/test_no_admin_token_auth.py index 72b350caf5..9f67fbd71d 100644 --- a/keystone/tests/test_no_admin_token_auth.py +++ b/keystone/tests/unit/test_no_admin_token_auth.py @@ -16,7 +16,7 @@ import os import webtest -from keystone import tests +from keystone.tests import unit as tests class TestNoAdminTokenAuth(tests.TestCase): diff --git a/keystone/tests/test_policy.py b/keystone/tests/unit/test_policy.py similarity index 98% rename from keystone/tests/test_policy.py rename to keystone/tests/unit/test_policy.py index b81a15debf..1975f5c3e0 100644 --- a/keystone/tests/test_policy.py +++ b/keystone/tests/unit/test_policy.py @@ -23,8 +23,8 @@ from testtools import matchers from keystone import exception from keystone.openstack.common import policy as common_policy from keystone.policy.backends import rules -from keystone import tests -from keystone.tests.ksfixtures import temporaryfile +from keystone.tests import unit as tests +from keystone.tests.unit.ksfixtures import temporaryfile class PolicyFileTestCase(tests.TestCase): diff --git a/keystone/tests/test_revoke.py b/keystone/tests/unit/test_revoke.py similarity index 99% rename from keystone/tests/test_revoke.py rename to keystone/tests/unit/test_revoke.py index 4f6b0dbba4..20a727efd3 100644 --- a/keystone/tests/test_revoke.py +++ b/keystone/tests/unit/test_revoke.py @@ -21,8 +21,8 @@ from testtools import matchers from keystone.contrib import revoke from keystone.contrib.revoke import model from keystone import exception -from keystone import tests -from keystone.tests import test_backend_sql +from keystone.tests import unit as tests +from keystone.tests.unit import test_backend_sql from keystone.token import provider diff --git a/keystone/tests/test_singular_plural.py b/keystone/tests/unit/test_singular_plural.py similarity index 100% rename from keystone/tests/test_singular_plural.py rename to keystone/tests/unit/test_singular_plural.py diff --git a/keystone/tests/test_sql_livetest.py b/keystone/tests/unit/test_sql_livetest.py similarity index 94% rename from keystone/tests/test_sql_livetest.py rename to keystone/tests/unit/test_sql_livetest.py index 83b726de06..4db6f3e909 100644 --- a/keystone/tests/test_sql_livetest.py +++ b/keystone/tests/unit/test_sql_livetest.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from keystone import tests -from keystone.tests import test_sql_migrate_extensions -from keystone.tests import test_sql_upgrade +from keystone.tests import unit as tests +from keystone.tests.unit import test_sql_migrate_extensions +from keystone.tests.unit import test_sql_upgrade class PostgresqlMigrateTests(test_sql_upgrade.SqlUpgradeTests): diff --git a/keystone/tests/test_sql_migrate_extensions.py b/keystone/tests/unit/test_sql_migrate_extensions.py similarity index 98% rename from keystone/tests/test_sql_migrate_extensions.py rename to keystone/tests/unit/test_sql_migrate_extensions.py index be3be8d6bb..4b23ba5174 100644 --- a/keystone/tests/test_sql_migrate_extensions.py +++ b/keystone/tests/unit/test_sql_migrate_extensions.py @@ -14,12 +14,12 @@ """ To run these tests against a live database: -1. Modify the file `keystone/tests/config_files/backend_sql.conf` to use +1. Modify the file `keystone/tests/unit/config_files/backend_sql.conf` to use the connection for your live database. 2. Set up a blank, live database. 3. Run the tests using:: - tox -e py27 -- keystone.tests.test_sql_migrate_extensions + tox -e py27 -- keystone.tests.unit.test_sql_migrate_extensions WARNING:: @@ -37,7 +37,7 @@ from keystone.contrib import example from keystone.contrib import federation from keystone.contrib import oauth1 from keystone.contrib import revoke -from keystone.tests import test_sql_upgrade +from keystone.tests.unit import test_sql_upgrade class SqlUpgradeExampleExtension(test_sql_upgrade.SqlMigrateBase): diff --git a/keystone/tests/test_sql_upgrade.py b/keystone/tests/unit/test_sql_upgrade.py similarity index 99% rename from keystone/tests/test_sql_upgrade.py rename to keystone/tests/unit/test_sql_upgrade.py index 07f93dd91f..038dd03b88 100644 --- a/keystone/tests/test_sql_upgrade.py +++ b/keystone/tests/unit/test_sql_upgrade.py @@ -14,12 +14,12 @@ """ To run these tests against a live database: -1. Modify the file ``keystone/tests/config_files/backend_sql.conf`` to use +1. Modify the file ``keystone/tests/unit/config_files/backend_sql.conf`` to use the connection for your live database. 2. Set up a blank, live database 3. Run the tests using:: - tox -e py27 -- keystone.tests.test_sql_upgrade + tox -e py27 -- keystone.tests.unit.test_sql_upgrade WARNING:: @@ -50,9 +50,9 @@ from keystone import config from keystone.contrib import federation from keystone.contrib import revoke from keystone import exception -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests.ksfixtures import database +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit.ksfixtures import database CONF = config.CONF diff --git a/keystone/tests/test_ssl.py b/keystone/tests/unit/test_ssl.py similarity index 98% rename from keystone/tests/test_ssl.py rename to keystone/tests/unit/test_ssl.py index ecfdf3b8f0..3f63c21053 100644 --- a/keystone/tests/test_ssl.py +++ b/keystone/tests/unit/test_ssl.py @@ -18,8 +18,8 @@ import ssl from keystone.common import environment from keystone import config -from keystone import tests -from keystone.tests.ksfixtures import appserver +from keystone.tests import unit as tests +from keystone.tests.unit.ksfixtures import appserver CONF = config.CONF diff --git a/keystone/tests/test_token_bind.py b/keystone/tests/unit/test_token_bind.py similarity index 98% rename from keystone/tests/test_token_bind.py rename to keystone/tests/unit/test_token_bind.py index a18a6f7e4a..7dc7ccca20 100644 --- a/keystone/tests/test_token_bind.py +++ b/keystone/tests/unit/test_token_bind.py @@ -18,8 +18,8 @@ import uuid from keystone.common import wsgi from keystone import exception from keystone.models import token_model -from keystone import tests -from keystone.tests import test_token_provider +from keystone.tests import unit as tests +from keystone.tests.unit import test_token_provider KERBEROS_BIND = 'USER@REALM' diff --git a/keystone/tests/test_token_provider.py b/keystone/tests/unit/test_token_provider.py similarity index 99% rename from keystone/tests/test_token_provider.py rename to keystone/tests/unit/test_token_provider.py index 439533ebd3..aa4e891554 100644 --- a/keystone/tests/test_token_provider.py +++ b/keystone/tests/unit/test_token_provider.py @@ -18,9 +18,9 @@ from oslo_utils import timeutils from keystone import config from keystone import exception -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests.ksfixtures import database +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit.ksfixtures import database from keystone import token from keystone.token.providers import pki diff --git a/keystone/tests/test_url_middleware.py b/keystone/tests/unit/test_url_middleware.py similarity index 97% rename from keystone/tests/test_url_middleware.py rename to keystone/tests/unit/test_url_middleware.py index 0fe6fe84d8..1b3872b52f 100644 --- a/keystone/tests/test_url_middleware.py +++ b/keystone/tests/unit/test_url_middleware.py @@ -15,7 +15,7 @@ import webob from keystone import middleware -from keystone import tests +from keystone.tests import unit as tests class FakeApp(object): diff --git a/keystone/tests/test_v2_controller.py b/keystone/tests/unit/test_v2_controller.py similarity index 96% rename from keystone/tests/test_v2_controller.py rename to keystone/tests/unit/test_v2_controller.py index cdbcb4b6e5..6c1edd0a30 100644 --- a/keystone/tests/test_v2_controller.py +++ b/keystone/tests/unit/test_v2_controller.py @@ -17,9 +17,9 @@ import uuid from keystone.assignment import controllers as assignment_controllers from keystone.resource import controllers as resource_controllers -from keystone import tests -from keystone.tests import default_fixtures -from keystone.tests.ksfixtures import database +from keystone.tests import unit as tests +from keystone.tests.unit import default_fixtures +from keystone.tests.unit.ksfixtures import database _ADMIN_CONTEXT = {'is_admin': True, 'query_string': {}} diff --git a/keystone/tests/test_v3.py b/keystone/tests/unit/test_v3.py similarity index 99% rename from keystone/tests/test_v3.py rename to keystone/tests/unit/test_v3.py index e71b7055d5..673ba2311f 100644 --- a/keystone/tests/test_v3.py +++ b/keystone/tests/unit/test_v3.py @@ -27,8 +27,8 @@ from keystone import config from keystone import exception from keystone import middleware from keystone.policy.backends import rules -from keystone import tests -from keystone.tests import rest +from keystone.tests import unit as tests +from keystone.tests.unit import rest CONF = config.CONF diff --git a/keystone/tests/test_v3_assignment.py b/keystone/tests/unit/test_v3_assignment.py similarity index 99% rename from keystone/tests/test_v3_assignment.py rename to keystone/tests/unit/test_v3_assignment.py index 4a98a312ec..d549cf3382 100644 --- a/keystone/tests/test_v3_assignment.py +++ b/keystone/tests/unit/test_v3_assignment.py @@ -16,8 +16,8 @@ from oslo_config import cfg from keystone.common import controller from keystone import exception -from keystone import tests -from keystone.tests import test_v3 +from keystone.tests import unit as tests +from keystone.tests.unit import test_v3 CONF = cfg.CONF diff --git a/keystone/tests/test_v3_auth.py b/keystone/tests/unit/test_v3_auth.py similarity index 99% rename from keystone/tests/test_v3_auth.py rename to keystone/tests/unit/test_v3_auth.py index a69170c94b..afa44b1e83 100644 --- a/keystone/tests/test_v3_auth.py +++ b/keystone/tests/unit/test_v3_auth.py @@ -30,8 +30,8 @@ from keystone import config from keystone.contrib import revoke from keystone import exception from keystone.policy.backends import rules -from keystone import tests -from keystone.tests import test_v3 +from keystone.tests import unit as tests +from keystone.tests.unit import test_v3 CONF = config.CONF diff --git a/keystone/tests/test_v3_catalog.py b/keystone/tests/unit/test_v3_catalog.py similarity index 99% rename from keystone/tests/test_v3_catalog.py rename to keystone/tests/unit/test_v3_catalog.py index e9469b9d27..b0aeda3757 100644 --- a/keystone/tests/test_v3_catalog.py +++ b/keystone/tests/unit/test_v3_catalog.py @@ -16,9 +16,9 @@ import copy import uuid from keystone import catalog -from keystone import tests -from keystone.tests.ksfixtures import database -from keystone.tests import test_v3 +from keystone.tests import unit as tests +from keystone.tests.unit.ksfixtures import database +from keystone.tests.unit import test_v3 class CatalogTestCase(test_v3.RestfulTestCase): diff --git a/keystone/tests/test_v3_controller.py b/keystone/tests/unit/test_v3_controller.py similarity index 97% rename from keystone/tests/test_v3_controller.py rename to keystone/tests/unit/test_v3_controller.py index 043a40f268..e53095dadc 100644 --- a/keystone/tests/test_v3_controller.py +++ b/keystone/tests/unit/test_v3_controller.py @@ -19,7 +19,7 @@ from testtools import matchers from keystone.common import controller from keystone import exception -from keystone import tests +from keystone.tests import unit as tests class V3ControllerTestCase(tests.TestCase): diff --git a/keystone/tests/test_v3_credential.py b/keystone/tests/unit/test_v3_credential.py similarity index 99% rename from keystone/tests/test_v3_credential.py rename to keystone/tests/unit/test_v3_credential.py index 310f6b23dd..26f4796bc1 100644 --- a/keystone/tests/test_v3_credential.py +++ b/keystone/tests/unit/test_v3_credential.py @@ -20,7 +20,7 @@ from keystoneclient.contrib.ec2 import utils as ec2_utils from keystone import config from keystone import exception -from keystone.tests import test_v3 +from keystone.tests.unit import test_v3 CONF = config.CONF diff --git a/keystone/tests/test_v3_endpoint_policy.py b/keystone/tests/unit/test_v3_endpoint_policy.py similarity index 99% rename from keystone/tests/test_v3_endpoint_policy.py rename to keystone/tests/unit/test_v3_endpoint_policy.py index 111fa836a8..437fb15599 100644 --- a/keystone/tests/test_v3_endpoint_policy.py +++ b/keystone/tests/unit/test_v3_endpoint_policy.py @@ -14,7 +14,7 @@ from testtools import matchers -from keystone.tests import test_v3 +from keystone.tests.unit import test_v3 class TestExtensionCase(test_v3.RestfulTestCase): diff --git a/keystone/tests/test_v3_federation.py b/keystone/tests/unit/test_v3_federation.py similarity index 99% rename from keystone/tests/test_v3_federation.py rename to keystone/tests/unit/test_v3_federation.py index 8a1b95a6a6..6fbf26a439 100644 --- a/keystone/tests/test_v3_federation.py +++ b/keystone/tests/unit/test_v3_federation.py @@ -33,9 +33,9 @@ from keystone.contrib.federation import utils as mapping_utils from keystone import exception from keystone import notifications from keystone.openstack.common import log -from keystone.tests import federation_fixtures -from keystone.tests import mapping_fixtures -from keystone.tests import test_v3 +from keystone.tests.unit import federation_fixtures +from keystone.tests.unit import mapping_fixtures +from keystone.tests.unit import test_v3 CONF = config.CONF diff --git a/keystone/tests/test_v3_filters.py b/keystone/tests/unit/test_v3_filters.py similarity index 99% rename from keystone/tests/test_v3_filters.py rename to keystone/tests/unit/test_v3_filters.py index c82fe38158..1f8073b549 100644 --- a/keystone/tests/test_v3_filters.py +++ b/keystone/tests/unit/test_v3_filters.py @@ -19,9 +19,9 @@ from oslo_serialization import jsonutils from keystone import config from keystone.policy.backends import rules -from keystone.tests import filtering -from keystone.tests.ksfixtures import temporaryfile -from keystone.tests import test_v3 +from keystone.tests.unit import filtering +from keystone.tests.unit.ksfixtures import temporaryfile +from keystone.tests.unit import test_v3 CONF = config.CONF diff --git a/keystone/tests/test_v3_identity.py b/keystone/tests/unit/test_v3_identity.py similarity index 99% rename from keystone/tests/test_v3_identity.py rename to keystone/tests/unit/test_v3_identity.py index 1dccf2ad0c..ac077297d5 100644 --- a/keystone/tests/test_v3_identity.py +++ b/keystone/tests/unit/test_v3_identity.py @@ -19,8 +19,8 @@ from testtools import matchers from keystone.common import controller from keystone import exception -from keystone import tests -from keystone.tests import test_v3 +from keystone.tests import unit as tests +from keystone.tests.unit import test_v3 CONF = cfg.CONF diff --git a/keystone/tests/test_v3_oauth1.py b/keystone/tests/unit/test_v3_oauth1.py similarity index 99% rename from keystone/tests/test_v3_oauth1.py rename to keystone/tests/unit/test_v3_oauth1.py index 1d46c35559..1d3a3f2b7f 100644 --- a/keystone/tests/test_v3_oauth1.py +++ b/keystone/tests/unit/test_v3_oauth1.py @@ -23,8 +23,8 @@ from keystone.contrib import oauth1 from keystone.contrib.oauth1 import controllers from keystone.contrib.oauth1 import core from keystone import exception -from keystone.tests.ksfixtures import temporaryfile -from keystone.tests import test_v3 +from keystone.tests.unit.ksfixtures import temporaryfile +from keystone.tests.unit import test_v3 CONF = config.CONF diff --git a/keystone/tests/test_v3_os_revoke.py b/keystone/tests/unit/test_v3_os_revoke.py similarity index 99% rename from keystone/tests/test_v3_os_revoke.py rename to keystone/tests/unit/test_v3_os_revoke.py index 0d6d799c6a..e43e45c3d6 100644 --- a/keystone/tests/test_v3_os_revoke.py +++ b/keystone/tests/unit/test_v3_os_revoke.py @@ -19,7 +19,7 @@ from testtools import matchers from keystone.contrib import revoke from keystone.contrib.revoke import model -from keystone.tests import test_v3 +from keystone.tests.unit import test_v3 from keystone.token import provider diff --git a/keystone/tests/test_v3_policy.py b/keystone/tests/unit/test_v3_policy.py similarity index 98% rename from keystone/tests/test_v3_policy.py rename to keystone/tests/unit/test_v3_policy.py index 06cde52ff3..538fc565cc 100644 --- a/keystone/tests/test_v3_policy.py +++ b/keystone/tests/unit/test_v3_policy.py @@ -14,7 +14,7 @@ import uuid -from keystone.tests import test_v3 +from keystone.tests.unit import test_v3 class PolicyTestCase(test_v3.RestfulTestCase): diff --git a/keystone/tests/test_v3_protection.py b/keystone/tests/unit/test_v3_protection.py similarity index 99% rename from keystone/tests/test_v3_protection.py rename to keystone/tests/unit/test_v3_protection.py index df5dc32196..38e1dc041c 100644 --- a/keystone/tests/test_v3_protection.py +++ b/keystone/tests/unit/test_v3_protection.py @@ -20,9 +20,9 @@ from oslo_serialization import jsonutils from keystone import config from keystone import exception from keystone.policy.backends import rules -from keystone import tests -from keystone.tests.ksfixtures import temporaryfile -from keystone.tests import test_v3 +from keystone.tests import unit as tests +from keystone.tests.unit.ksfixtures import temporaryfile +from keystone.tests.unit import test_v3 CONF = config.CONF diff --git a/keystone/tests/test_validation.py b/keystone/tests/unit/test_validation.py similarity index 100% rename from keystone/tests/test_validation.py rename to keystone/tests/unit/test_validation.py diff --git a/keystone/tests/test_versions.py b/keystone/tests/unit/test_versions.py similarity index 99% rename from keystone/tests/test_versions.py rename to keystone/tests/unit/test_versions.py index 9b1ab8c9c6..614e0f2107 100644 --- a/keystone/tests/test_versions.py +++ b/keystone/tests/unit/test_versions.py @@ -24,7 +24,7 @@ from testtools import matchers as tt_matchers from keystone.common import json_home from keystone import config from keystone import controllers -from keystone import tests +from keystone.tests import unit as tests CONF = config.CONF diff --git a/keystone/tests/test_wsgi.py b/keystone/tests/unit/test_wsgi.py similarity index 99% rename from keystone/tests/test_wsgi.py rename to keystone/tests/unit/test_wsgi.py index 4c8d4f57ba..ca56eadd9e 100644 --- a/keystone/tests/test_wsgi.py +++ b/keystone/tests/unit/test_wsgi.py @@ -26,7 +26,7 @@ import webob from keystone.common import environment from keystone.common import wsgi from keystone import exception -from keystone import tests +from keystone.tests import unit as tests class FakeApp(wsgi.Application): diff --git a/keystone/tests/unit/tests/test_utils.py b/keystone/tests/unit/tests/test_utils.py index 3efa58d8b3..22c485c037 100644 --- a/keystone/tests/unit/tests/test_utils.py +++ b/keystone/tests/unit/tests/test_utils.py @@ -13,7 +13,7 @@ from testtools import matchers from testtools import testcase -from keystone.tests import utils +from keystone.tests.unit import utils class TestWipDecorator(testcase.TestCase): diff --git a/keystone/tests/unit/token/test_token_data_helper.py b/keystone/tests/unit/token/test_token_data_helper.py index 169f5fe3e6..a12a22d4a1 100644 --- a/keystone/tests/unit/token/test_token_data_helper.py +++ b/keystone/tests/unit/token/test_token_data_helper.py @@ -16,7 +16,7 @@ import uuid from testtools import matchers from keystone import exception -from keystone import tests +from keystone.tests import unit as tests from keystone.token.providers import common diff --git a/keystone/tests/unit/token/test_token_model.py b/keystone/tests/unit/token/test_token_model.py index d9118cf605..9b2dd8dd11 100644 --- a/keystone/tests/unit/token/test_token_model.py +++ b/keystone/tests/unit/token/test_token_model.py @@ -18,8 +18,8 @@ from oslo_utils import timeutils from keystone.common import config from keystone import exception from keystone.models import token_model -from keystone.tests import core -from keystone.tests import test_token_provider +from keystone.tests.unit import core +from keystone.tests.unit import test_token_provider CONF = config.CONF diff --git a/keystone/tests/utils.py b/keystone/tests/unit/utils.py similarity index 100% rename from keystone/tests/utils.py rename to keystone/tests/unit/utils.py