From 14e090154c10001550127628c2728013f15d4256 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <saschpe@suse.de>
Date: Mon, 21 Jan 2013 15:34:42 +0100
Subject: [PATCH] Move 'tests' directory into 'keystone' package

Similar to a range of other components (e.g. glance,nova,...) and recent
reviews by Monty.

Running individual tests can be done like this:

./run_tests.sh keystone.tests.test_drivers

Change-Id: I2482a48322150e5eb09b703326a94d8283f1c75b
---
 .gitignore                                                | 2 +-
 MANIFEST.in                                               | 2 +-
 doc/source/developing.rst                                 | 8 ++++----
 tests/tmp/.gitkeep => keystone/tests/__init__.py          | 0
 {tests => keystone/tests}/_ldap_livetest.py               | 2 +-
 {tests => keystone/tests}/_ldap_tls_livetest.py           | 2 +-
 {tests => keystone/tests}/_sql_livetest.py                | 0
 {tests => keystone/tests}/_test_import_auth_token.py      | 0
 .../tests}/auth_plugin_external_disabled.conf             | 0
 .../tests}/auth_plugin_external_domain.conf               | 0
 {tests => keystone/tests}/backend_db2.conf                | 0
 {tests => keystone/tests}/backend_ldap.conf               | 0
 {tests => keystone/tests}/backend_ldap_sql.conf           | 1 +
 {tests => keystone/tests}/backend_liveldap.conf           | 0
 {tests => keystone/tests}/backend_mysql.conf              | 0
 {tests => keystone/tests}/backend_pam.conf                | 0
 {tests => keystone/tests}/backend_postgresql.conf         | 0
 {tests => keystone/tests}/backend_sql.conf                | 0
 {tests => keystone/tests}/backend_sql_disk.conf           | 0
 {tests => keystone/tests}/backend_tls_liveldap.conf       | 0
 keystone/{test.py => tests/core.py}                       | 4 ++--
 {tests => keystone/tests}/default_catalog.templates       | 0
 {tests => keystone/tests}/default_fixtures.py             | 0
 {tests => keystone/tests}/legacy_d5.mysql                 | 0
 {tests => keystone/tests}/legacy_d5.sqlite                | 0
 {tests => keystone/tests}/legacy_diablo.mysql             | 0
 {tests => keystone/tests}/legacy_diablo.sqlite            | 0
 {tests => keystone/tests}/legacy_essex.mysql              | 0
 {tests => keystone/tests}/legacy_essex.sqlite             | 0
 {tests => keystone/tests}/test_auth.py                    | 2 +-
 {tests => keystone/tests}/test_auth_plugin.conf           | 0
 {tests => keystone/tests}/test_auth_plugin.py             | 2 +-
 {tests => keystone/tests}/test_backend.py                 | 2 +-
 {tests => keystone/tests}/test_backend_kvs.py             | 3 +--
 {tests => keystone/tests}/test_backend_ldap.py            | 2 +-
 {tests => keystone/tests}/test_backend_memcache.py        | 2 +-
 {tests => keystone/tests}/test_backend_pam.py             | 2 +-
 {tests => keystone/tests}/test_backend_sql.py             | 3 +--
 {tests => keystone/tests}/test_backend_templated.py       | 2 +-
 {tests => keystone/tests}/test_catalog.py                 | 0
 {tests => keystone/tests}/test_cert_setup.py              | 2 +-
 {tests => keystone/tests}/test_config.py                  | 2 +-
 {tests => keystone/tests}/test_content_types.py           | 2 +-
 {tests => keystone/tests}/test_contrib_s3_core.py         | 2 +-
 {tests => keystone/tests}/test_contrib_stats_core.py      | 2 +-
 {tests => keystone/tests}/test_drivers.py                 | 0
 {tests => keystone/tests}/test_exception.py               | 2 +-
 {tests => keystone/tests}/test_import_legacy.py           | 2 +-
 {tests => keystone/tests}/test_injection.py               | 0
 {tests => keystone/tests}/test_ipv6.py                    | 2 +-
 {tests => keystone/tests}/test_keystoneclient.py          | 3 +--
 {tests => keystone/tests}/test_keystoneclient_sql.py      | 3 +--
 {tests => keystone/tests}/test_middleware.py              | 2 +-
 {tests => keystone/tests}/test_no_admin_token_auth.py     | 2 +-
 {tests => keystone/tests}/test_overrides.conf             | 6 +++---
 {tests => keystone/tests}/test_pki_token_provider.conf    | 0
 {tests => keystone/tests}/test_policy.py                  | 2 +-
 {tests => keystone/tests}/test_s3_token_middleware.py     | 0
 {tests => keystone/tests}/test_serializer.py              | 2 +-
 {tests => keystone/tests}/test_singular_plural.py         | 0
 {tests => keystone/tests}/test_sizelimit.py               | 2 +-
 {tests => keystone/tests}/test_sql_core.py                | 2 +-
 {tests => keystone/tests}/test_sql_migrate_extensions.py  | 0
 {tests => keystone/tests}/test_sql_upgrade.py             | 6 +++---
 {tests => keystone/tests}/test_ssl.py                     | 2 +-
 {tests => keystone/tests}/test_token_bind.py              | 2 +-
 {tests => keystone/tests}/test_token_provider.py          | 2 +-
 {tests => keystone/tests}/test_url_middleware.py          | 2 +-
 {tests => keystone/tests}/test_utils.py                   | 2 +-
 {tests => keystone/tests}/test_uuid_token_provider.conf   | 0
 {tests => keystone/tests}/test_v3.py                      | 3 +--
 {tests => keystone/tests}/test_v3_auth.py                 | 2 +-
 {tests => keystone/tests}/test_v3_catalog.py              | 0
 {tests => keystone/tests}/test_v3_credential.py           | 0
 {tests => keystone/tests}/test_v3_identity.py             | 0
 {tests => keystone/tests}/test_v3_policy.py               | 0
 {tests => keystone/tests}/test_v3_protection.py           | 0
 {tests => keystone/tests}/test_versions.py                | 2 +-
 {tests => keystone/tests}/test_wsgi.py                    | 3 +--
 keystone/tests/tmp/.gitkeep                               | 0
 run_tests.sh                                              | 4 ++--
 setup.cfg                                                 | 2 +-
 82 files changed, 54 insertions(+), 59 deletions(-)
 rename tests/tmp/.gitkeep => keystone/tests/__init__.py (100%)
 rename {tests => keystone/tests}/_ldap_livetest.py (99%)
 rename {tests => keystone/tests}/_ldap_tls_livetest.py (98%)
 rename {tests => keystone/tests}/_sql_livetest.py (100%)
 rename {tests => keystone/tests}/_test_import_auth_token.py (100%)
 rename {tests => keystone/tests}/auth_plugin_external_disabled.conf (100%)
 rename {tests => keystone/tests}/auth_plugin_external_domain.conf (100%)
 rename {tests => keystone/tests}/backend_db2.conf (100%)
 rename {tests => keystone/tests}/backend_ldap.conf (100%)
 rename {tests => keystone/tests}/backend_ldap_sql.conf (99%)
 rename {tests => keystone/tests}/backend_liveldap.conf (100%)
 rename {tests => keystone/tests}/backend_mysql.conf (100%)
 rename {tests => keystone/tests}/backend_pam.conf (100%)
 rename {tests => keystone/tests}/backend_postgresql.conf (100%)
 rename {tests => keystone/tests}/backend_sql.conf (100%)
 rename {tests => keystone/tests}/backend_sql_disk.conf (100%)
 rename {tests => keystone/tests}/backend_tls_liveldap.conf (100%)
 rename keystone/{test.py => tests/core.py} (99%)
 rename {tests => keystone/tests}/default_catalog.templates (100%)
 rename {tests => keystone/tests}/default_fixtures.py (100%)
 rename {tests => keystone/tests}/legacy_d5.mysql (100%)
 rename {tests => keystone/tests}/legacy_d5.sqlite (100%)
 rename {tests => keystone/tests}/legacy_diablo.mysql (100%)
 rename {tests => keystone/tests}/legacy_diablo.sqlite (100%)
 rename {tests => keystone/tests}/legacy_essex.mysql (100%)
 rename {tests => keystone/tests}/legacy_essex.sqlite (100%)
 rename {tests => keystone/tests}/test_auth.py (99%)
 rename {tests => keystone/tests}/test_auth_plugin.conf (100%)
 rename {tests => keystone/tests}/test_auth_plugin.py (99%)
 rename {tests => keystone/tests}/test_backend.py (99%)
 rename {tests => keystone/tests}/test_backend_kvs.py (99%)
 rename {tests => keystone/tests}/test_backend_ldap.py (99%)
 rename {tests => keystone/tests}/test_backend_memcache.py (99%)
 rename {tests => keystone/tests}/test_backend_pam.py (98%)
 rename {tests => keystone/tests}/test_backend_sql.py (99%)
 rename {tests => keystone/tests}/test_backend_templated.py (98%)
 rename {tests => keystone/tests}/test_catalog.py (100%)
 rename {tests => keystone/tests}/test_cert_setup.py (98%)
 rename {tests => keystone/tests}/test_config.py (93%)
 rename {tests => keystone/tests}/test_content_types.py (99%)
 rename {tests => keystone/tests}/test_contrib_s3_core.py (98%)
 rename {tests => keystone/tests}/test_contrib_stats_core.py (97%)
 rename {tests => keystone/tests}/test_drivers.py (100%)
 rename {tests => keystone/tests}/test_exception.py (99%)
 rename {tests => keystone/tests}/test_import_legacy.py (99%)
 rename {tests => keystone/tests}/test_injection.py (100%)
 rename {tests => keystone/tests}/test_ipv6.py (97%)
 rename {tests => keystone/tests}/test_keystoneclient.py (99%)
 rename {tests => keystone/tests}/test_keystoneclient_sql.py (99%)
 rename {tests => keystone/tests}/test_middleware.py (99%)
 rename {tests => keystone/tests}/test_no_admin_token_auth.py (97%)
 rename {tests => keystone/tests}/test_overrides.conf (67%)
 rename {tests => keystone/tests}/test_pki_token_provider.conf (100%)
 rename {tests => keystone/tests}/test_policy.py (99%)
 rename {tests => keystone/tests}/test_s3_token_middleware.py (100%)
 rename {tests => keystone/tests}/test_serializer.py (99%)
 rename {tests => keystone/tests}/test_singular_plural.py (100%)
 rename {tests => keystone/tests}/test_sizelimit.py (98%)
 rename {tests => keystone/tests}/test_sql_core.py (99%)
 rename {tests => keystone/tests}/test_sql_migrate_extensions.py (100%)
 rename {tests => keystone/tests}/test_sql_upgrade.py (99%)
 rename {tests => keystone/tests}/test_ssl.py (99%)
 rename {tests => keystone/tests}/test_token_bind.py (99%)
 rename {tests => keystone/tests}/test_token_provider.py (99%)
 rename {tests => keystone/tests}/test_url_middleware.py (98%)
 rename {tests => keystone/tests}/test_utils.py (98%)
 rename {tests => keystone/tests}/test_uuid_token_provider.conf (100%)
 rename {tests => keystone/tests}/test_v3.py (99%)
 rename {tests => keystone/tests}/test_v3_auth.py (99%)
 rename {tests => keystone/tests}/test_v3_catalog.py (100%)
 rename {tests => keystone/tests}/test_v3_credential.py (100%)
 rename {tests => keystone/tests}/test_v3_identity.py (100%)
 rename {tests => keystone/tests}/test_v3_policy.py (100%)
 rename {tests => keystone/tests}/test_v3_protection.py (100%)
 rename {tests => keystone/tests}/test_versions.py (99%)
 rename {tests => keystone/tests}/test_wsgi.py (99%)
 create mode 100644 keystone/tests/tmp/.gitkeep

diff --git a/.gitignore b/.gitignore
index d4915b0b0f..1297ba42c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,6 @@ build/
 dist/
 etc/keystone.conf
 etc/logging.conf
-tests/tmp/
+keystone/tests/tmp/
 .project
 .pydevproject
diff --git a/MANIFEST.in b/MANIFEST.in
index 2373ea2887..9c59a76b43 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,7 +16,7 @@ include etc/*
 include httpd/*
 graft bin
 graft doc
-graft tests
+graft keystone/tests
 graft tools
 graft examples
 recursive-include keystone *.json *.xml *.cfg *.pem README *.po *.pot *.sql
diff --git a/doc/source/developing.rst b/doc/source/developing.rst
index 2cf4b98e40..7029e1c82b 100644
--- a/doc/source/developing.rst
+++ b/doc/source/developing.rst
@@ -133,8 +133,8 @@ Test Structure
 --------------
 
 ``./run_test.sh`` uses its python cohort (``run_tests.py``) to iterate
-through the ``tests`` directory, using Nosetest to collect the tests and
-invoke them using an OpenStack custom test running that displays the tests
+through the ``keystone/tests`` directory, using Nosetest to collect the tests
+and invoke them using an OpenStack custom test running that displays the tests
 as well as the time taken to run those tests.
 
 Not all of the tests in the tests directory are strictly unit tests. Keystone
@@ -223,9 +223,9 @@ and set environment variables ``KEYSTONE_IDENTITY_BACKEND=ldap`` and
 ``KEYSTONE_CLEAR_LDAP=yes`` in your ``localrc`` file.
 
 The unit tests can be run against a live server with
-``tests/_ldap_livetest.py``.  The default password is ``test`` but if you have
+``keystone/tests/_ldap_livetest.py``.  The default password is ``test`` but if you have
 installed devstack with a different LDAP password, modify the file
-``tests/backend_liveldap.conf`` to reflect your password.
+``keystone/tests/backend_liveldap.conf`` to reflect your password.
 
 
 Building the Documentation
diff --git a/tests/tmp/.gitkeep b/keystone/tests/__init__.py
similarity index 100%
rename from tests/tmp/.gitkeep
rename to keystone/tests/__init__.py
diff --git a/tests/_ldap_livetest.py b/keystone/tests/_ldap_livetest.py
similarity index 99%
rename from tests/_ldap_livetest.py
rename to keystone/tests/_ldap_livetest.py
index ead54ea7af..59da4e6678 100644
--- a/tests/_ldap_livetest.py
+++ b/keystone/tests/_ldap_livetest.py
@@ -22,7 +22,7 @@ from keystone.common import ldap as ldap_common
 from keystone import config
 from keystone import exception
 from keystone.identity.backends import ldap as identity_ldap
-from keystone import test
+from keystone.tests import core as test
 
 import test_backend_ldap
 
diff --git a/tests/_ldap_tls_livetest.py b/keystone/tests/_ldap_tls_livetest.py
similarity index 98%
rename from tests/_ldap_tls_livetest.py
rename to keystone/tests/_ldap_tls_livetest.py
index f52b6360c8..f1c43453dd 100644
--- a/tests/_ldap_tls_livetest.py
+++ b/keystone/tests/_ldap_tls_livetest.py
@@ -21,7 +21,7 @@ import ldap.modlist
 from keystone import config
 from keystone import exception
 from keystone import identity
-from keystone import test
+from keystone.tests import core as test
 
 import _ldap_livetest
 
diff --git a/tests/_sql_livetest.py b/keystone/tests/_sql_livetest.py
similarity index 100%
rename from tests/_sql_livetest.py
rename to keystone/tests/_sql_livetest.py
diff --git a/tests/_test_import_auth_token.py b/keystone/tests/_test_import_auth_token.py
similarity index 100%
rename from tests/_test_import_auth_token.py
rename to keystone/tests/_test_import_auth_token.py
diff --git a/tests/auth_plugin_external_disabled.conf b/keystone/tests/auth_plugin_external_disabled.conf
similarity index 100%
rename from tests/auth_plugin_external_disabled.conf
rename to keystone/tests/auth_plugin_external_disabled.conf
diff --git a/tests/auth_plugin_external_domain.conf b/keystone/tests/auth_plugin_external_domain.conf
similarity index 100%
rename from tests/auth_plugin_external_domain.conf
rename to keystone/tests/auth_plugin_external_domain.conf
diff --git a/tests/backend_db2.conf b/keystone/tests/backend_db2.conf
similarity index 100%
rename from tests/backend_db2.conf
rename to keystone/tests/backend_db2.conf
diff --git a/tests/backend_ldap.conf b/keystone/tests/backend_ldap.conf
similarity index 100%
rename from tests/backend_ldap.conf
rename to keystone/tests/backend_ldap.conf
diff --git a/tests/backend_ldap_sql.conf b/keystone/tests/backend_ldap_sql.conf
similarity index 99%
rename from tests/backend_ldap_sql.conf
rename to keystone/tests/backend_ldap_sql.conf
index 8dcfa40d90..5579e75d52 100644
--- a/tests/backend_ldap_sql.conf
+++ b/keystone/tests/backend_ldap_sql.conf
@@ -34,3 +34,4 @@ driver = keystone.policy.backends.sql.Policy
 
 [trust]
 driver = keystone.trust.backends.sql.Trust
+
diff --git a/tests/backend_liveldap.conf b/keystone/tests/backend_liveldap.conf
similarity index 100%
rename from tests/backend_liveldap.conf
rename to keystone/tests/backend_liveldap.conf
diff --git a/tests/backend_mysql.conf b/keystone/tests/backend_mysql.conf
similarity index 100%
rename from tests/backend_mysql.conf
rename to keystone/tests/backend_mysql.conf
diff --git a/tests/backend_pam.conf b/keystone/tests/backend_pam.conf
similarity index 100%
rename from tests/backend_pam.conf
rename to keystone/tests/backend_pam.conf
diff --git a/tests/backend_postgresql.conf b/keystone/tests/backend_postgresql.conf
similarity index 100%
rename from tests/backend_postgresql.conf
rename to keystone/tests/backend_postgresql.conf
diff --git a/tests/backend_sql.conf b/keystone/tests/backend_sql.conf
similarity index 100%
rename from tests/backend_sql.conf
rename to keystone/tests/backend_sql.conf
diff --git a/tests/backend_sql_disk.conf b/keystone/tests/backend_sql_disk.conf
similarity index 100%
rename from tests/backend_sql_disk.conf
rename to keystone/tests/backend_sql_disk.conf
diff --git a/tests/backend_tls_liveldap.conf b/keystone/tests/backend_tls_liveldap.conf
similarity index 100%
rename from tests/backend_tls_liveldap.conf
rename to keystone/tests/backend_tls_liveldap.conf
diff --git a/keystone/test.py b/keystone/tests/core.py
similarity index 99%
rename from keystone/test.py
rename to keystone/tests/core.py
index 9118b2ea3b..21dc61dccb 100644
--- a/keystone/test.py
+++ b/keystone/tests/core.py
@@ -57,9 +57,9 @@ from keystone import trust
 
 
 LOG = logging.getLogger(__name__)
-ROOTDIR = os.path.dirname(os.path.abspath(os.curdir))
+ROOTDIR = os.path.dirname(os.path.abspath('..'))
 VENDOR = os.path.join(ROOTDIR, 'vendor')
-TESTSDIR = os.path.join(ROOTDIR, 'tests')
+TESTSDIR = os.path.join(ROOTDIR, 'keystone', 'tests')
 ETCDIR = os.path.join(ROOTDIR, 'etc')
 TMPDIR = os.path.join(TESTSDIR, 'tmp')
 
diff --git a/tests/default_catalog.templates b/keystone/tests/default_catalog.templates
similarity index 100%
rename from tests/default_catalog.templates
rename to keystone/tests/default_catalog.templates
diff --git a/tests/default_fixtures.py b/keystone/tests/default_fixtures.py
similarity index 100%
rename from tests/default_fixtures.py
rename to keystone/tests/default_fixtures.py
diff --git a/tests/legacy_d5.mysql b/keystone/tests/legacy_d5.mysql
similarity index 100%
rename from tests/legacy_d5.mysql
rename to keystone/tests/legacy_d5.mysql
diff --git a/tests/legacy_d5.sqlite b/keystone/tests/legacy_d5.sqlite
similarity index 100%
rename from tests/legacy_d5.sqlite
rename to keystone/tests/legacy_d5.sqlite
diff --git a/tests/legacy_diablo.mysql b/keystone/tests/legacy_diablo.mysql
similarity index 100%
rename from tests/legacy_diablo.mysql
rename to keystone/tests/legacy_diablo.mysql
diff --git a/tests/legacy_diablo.sqlite b/keystone/tests/legacy_diablo.sqlite
similarity index 100%
rename from tests/legacy_diablo.sqlite
rename to keystone/tests/legacy_diablo.sqlite
diff --git a/tests/legacy_essex.mysql b/keystone/tests/legacy_essex.mysql
similarity index 100%
rename from tests/legacy_essex.mysql
rename to keystone/tests/legacy_essex.mysql
diff --git a/tests/legacy_essex.sqlite b/keystone/tests/legacy_essex.sqlite
similarity index 100%
rename from tests/legacy_essex.sqlite
rename to keystone/tests/legacy_essex.sqlite
diff --git a/tests/test_auth.py b/keystone/tests/test_auth.py
similarity index 99%
rename from tests/test_auth.py
rename to keystone/tests/test_auth.py
index e8e6c7a9a3..598b11d36f 100644
--- a/tests/test_auth.py
+++ b/keystone/tests/test_auth.py
@@ -16,7 +16,7 @@ import copy
 import datetime
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import auth
 from keystone import config
diff --git a/tests/test_auth_plugin.conf b/keystone/tests/test_auth_plugin.conf
similarity index 100%
rename from tests/test_auth_plugin.conf
rename to keystone/tests/test_auth_plugin.conf
diff --git a/tests/test_auth_plugin.py b/keystone/tests/test_auth_plugin.py
similarity index 99%
rename from tests/test_auth_plugin.py
rename to keystone/tests/test_auth_plugin.py
index d158ec46b1..e3346cf181 100644
--- a/tests/test_auth_plugin.py
+++ b/keystone/tests/test_auth_plugin.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import auth
 from keystone import exception
diff --git a/tests/test_backend.py b/keystone/tests/test_backend.py
similarity index 99%
rename from tests/test_backend.py
rename to keystone/tests/test_backend.py
index 75a9477368..8622b10d25 100644
--- a/tests/test_backend.py
+++ b/keystone/tests/test_backend.py
@@ -17,7 +17,7 @@
 import datetime
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.catalog import core
 from keystone import config
diff --git a/tests/test_backend_kvs.py b/keystone/tests/test_backend_kvs.py
similarity index 99%
rename from tests/test_backend_kvs.py
rename to keystone/tests/test_backend_kvs.py
index d92a751002..34b87c607b 100644
--- a/tests/test_backend_kvs.py
+++ b/keystone/tests/test_backend_kvs.py
@@ -15,10 +15,9 @@
 # under the License.
 import uuid
 
-from keystone import test
-
 from keystone import exception
 from keystone import identity
+from keystone.tests import core as test
 
 import default_fixtures
 import test_backend
diff --git a/tests/test_backend_ldap.py b/keystone/tests/test_backend_ldap.py
similarity index 99%
rename from tests/test_backend_ldap.py
rename to keystone/tests/test_backend_ldap.py
index ec2b27376c..9c1c98d521 100644
--- a/tests/test_backend_ldap.py
+++ b/keystone/tests/test_backend_ldap.py
@@ -23,7 +23,7 @@ from keystone.common import sql
 from keystone import config
 from keystone import exception
 from keystone import identity
-from keystone import test
+from keystone.tests import core as test
 
 import default_fixtures
 import test_backend
diff --git a/tests/test_backend_memcache.py b/keystone/tests/test_backend_memcache.py
similarity index 99%
rename from tests/test_backend_memcache.py
rename to keystone/tests/test_backend_memcache.py
index 7516e0dd96..0377c0e670 100644
--- a/tests/test_backend_memcache.py
+++ b/keystone/tests/test_backend_memcache.py
@@ -20,7 +20,7 @@ import uuid
 
 import memcache
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import utils
 from keystone import exception
diff --git a/tests/test_backend_pam.py b/keystone/tests/test_backend_pam.py
similarity index 98%
rename from tests/test_backend_pam.py
rename to keystone/tests/test_backend_pam.py
index b66faa9c9d..65817837c1 100644
--- a/tests/test_backend_pam.py
+++ b/keystone/tests/test_backend_pam.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone.identity.backends import pam as identity_pam
diff --git a/tests/test_backend_sql.py b/keystone/tests/test_backend_sql.py
similarity index 99%
rename from tests/test_backend_sql.py
rename to keystone/tests/test_backend_sql.py
index 89276e8686..773ae862fc 100644
--- a/tests/test_backend_sql.py
+++ b/keystone/tests/test_backend_sql.py
@@ -18,11 +18,10 @@ import uuid
 
 import sqlalchemy
 
-from keystone import test
-
 from keystone.common import sql
 from keystone import config
 from keystone import exception
+from keystone.tests import core as test
 
 import default_fixtures
 import test_backend
diff --git a/tests/test_backend_templated.py b/keystone/tests/test_backend_templated.py
similarity index 98%
rename from tests/test_backend_templated.py
rename to keystone/tests/test_backend_templated.py
index bfa1919259..603ad82a19 100644
--- a/tests/test_backend_templated.py
+++ b/keystone/tests/test_backend_templated.py
@@ -16,7 +16,7 @@
 
 import os
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import exception
 
diff --git a/tests/test_catalog.py b/keystone/tests/test_catalog.py
similarity index 100%
rename from tests/test_catalog.py
rename to keystone/tests/test_catalog.py
diff --git a/tests/test_cert_setup.py b/keystone/tests/test_cert_setup.py
similarity index 98%
rename from tests/test_cert_setup.py
rename to keystone/tests/test_cert_setup.py
index e6c395e907..88fa6d753a 100644
--- a/tests/test_cert_setup.py
+++ b/keystone/tests/test_cert_setup.py
@@ -18,7 +18,7 @@
 import os
 import shutil
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import openssl
 from keystone import exception
diff --git a/tests/test_config.py b/keystone/tests/test_config.py
similarity index 93%
rename from tests/test_config.py
rename to keystone/tests/test_config.py
index 3165a4f469..28b372a63c 100644
--- a/tests/test_config.py
+++ b/keystone/tests/test_config.py
@@ -1,4 +1,4 @@
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import exception
diff --git a/tests/test_content_types.py b/keystone/tests/test_content_types.py
similarity index 99%
rename from tests/test_content_types.py
rename to keystone/tests/test_content_types.py
index ebb5dcef1f..7c87473248 100644
--- a/tests/test_content_types.py
+++ b/keystone/tests/test_content_types.py
@@ -20,7 +20,7 @@ import uuid
 from lxml import etree
 import webtest
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import extension
 from keystone.common import serializer
diff --git a/tests/test_contrib_s3_core.py b/keystone/tests/test_contrib_s3_core.py
similarity index 98%
rename from tests/test_contrib_s3_core.py
rename to keystone/tests/test_contrib_s3_core.py
index e2c328b535..3cf799bc3f 100644
--- a/tests/test_contrib_s3_core.py
+++ b/keystone/tests/test_contrib_s3_core.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.contrib import ec2
 from keystone.contrib import s3
diff --git a/tests/test_contrib_stats_core.py b/keystone/tests/test_contrib_stats_core.py
similarity index 97%
rename from tests/test_contrib_stats_core.py
rename to keystone/tests/test_contrib_stats_core.py
index 907c7d25a5..567c485eb8 100644
--- a/tests/test_contrib_stats_core.py
+++ b/keystone/tests/test_contrib_stats_core.py
@@ -17,7 +17,7 @@
 from keystone.contrib import stats
 
 from keystone import config
-from keystone import test
+from keystone.tests import core as test
 
 
 CONF = config.CONF
diff --git a/tests/test_drivers.py b/keystone/tests/test_drivers.py
similarity index 100%
rename from tests/test_drivers.py
rename to keystone/tests/test_drivers.py
diff --git a/tests/test_exception.py b/keystone/tests/test_exception.py
similarity index 99%
rename from tests/test_exception.py
rename to keystone/tests/test_exception.py
index d442d57212..9658ed1910 100644
--- a/tests/test_exception.py
+++ b/keystone/tests/test_exception.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import wsgi
 from keystone import config
diff --git a/tests/test_import_legacy.py b/keystone/tests/test_import_legacy.py
similarity index 99%
rename from tests/test_import_legacy.py
rename to keystone/tests/test_import_legacy.py
index 9e16409934..b3b83c0f16 100644
--- a/tests/test_import_legacy.py
+++ b/keystone/tests/test_import_legacy.py
@@ -21,7 +21,7 @@ try:
 except ImportError:
     from pysqlite2 import dbapi2 as dbapi
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.catalog.backends import templated as catalog_templated
 from keystone.common.sql import legacy
diff --git a/tests/test_injection.py b/keystone/tests/test_injection.py
similarity index 100%
rename from tests/test_injection.py
rename to keystone/tests/test_injection.py
diff --git a/tests/test_ipv6.py b/keystone/tests/test_ipv6.py
similarity index 97%
rename from tests/test_ipv6.py
rename to keystone/tests/test_ipv6.py
index 9825a5fad6..fa64bc4311 100644
--- a/tests/test_ipv6.py
+++ b/keystone/tests/test_ipv6.py
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import environment
 from keystone import config
diff --git a/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py
similarity index 99%
rename from tests/test_keystoneclient.py
rename to keystone/tests/test_keystoneclient.py
index 38062d4b6f..7e59885d86 100644
--- a/tests/test_keystoneclient.py
+++ b/keystone/tests/test_keystoneclient.py
@@ -17,11 +17,10 @@
 import uuid
 import webob
 
-from keystone import test
-
 from keystone import config
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
+from keystone.tests import core as test
 
 import default_fixtures
 
diff --git a/tests/test_keystoneclient_sql.py b/keystone/tests/test_keystoneclient_sql.py
similarity index 99%
rename from tests/test_keystoneclient_sql.py
rename to keystone/tests/test_keystoneclient_sql.py
index 166d808cc7..105d8353eb 100644
--- a/tests/test_keystoneclient_sql.py
+++ b/keystone/tests/test_keystoneclient_sql.py
@@ -16,10 +16,9 @@
 
 import uuid
 
-from keystone import test
-
 from keystone.common import sql
 from keystone import config
+from keystone.tests import core as test
 
 import test_keystoneclient
 
diff --git a/tests/test_middleware.py b/keystone/tests/test_middleware.py
similarity index 99%
rename from tests/test_middleware.py
rename to keystone/tests/test_middleware.py
index 9f9d3fd2d7..df33d172c5 100644
--- a/tests/test_middleware.py
+++ b/keystone/tests/test_middleware.py
@@ -16,7 +16,7 @@
 
 import webob
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import middleware
diff --git a/tests/test_no_admin_token_auth.py b/keystone/tests/test_no_admin_token_auth.py
similarity index 97%
rename from tests/test_no_admin_token_auth.py
rename to keystone/tests/test_no_admin_token_auth.py
index ffdaa7a899..3a7113d8b9 100644
--- a/tests/test_no_admin_token_auth.py
+++ b/keystone/tests/test_no_admin_token_auth.py
@@ -2,7 +2,7 @@
 import os
 import webtest
 
-from keystone import test
+from keystone.tests import core as test
 
 
 def _generate_paste_config():
diff --git a/tests/test_overrides.conf b/keystone/tests/test_overrides.conf
similarity index 67%
rename from tests/test_overrides.conf
rename to keystone/tests/test_overrides.conf
index ef7524b78a..aac29f2610 100644
--- a/tests/test_overrides.conf
+++ b/keystone/tests/test_overrides.conf
@@ -15,6 +15,6 @@ driver = keystone.trust.backends.kvs.Trust
 driver = keystone.token.backends.kvs.Token
 
 [signing]
-certfile = ../examples/pki/certs/signing_cert.pem
-keyfile = ../examples/pki/private/signing_key.pem
-ca_certs = ../examples/pki/certs/cacert.pem
+certfile = ../../examples/pki/certs/signing_cert.pem
+keyfile = ../../examples/pki/private/signing_key.pem
+ca_certs = ../../examples/pki/certs/cacert.pem
diff --git a/tests/test_pki_token_provider.conf b/keystone/tests/test_pki_token_provider.conf
similarity index 100%
rename from tests/test_pki_token_provider.conf
rename to keystone/tests/test_pki_token_provider.conf
diff --git a/tests/test_policy.py b/keystone/tests/test_policy.py
similarity index 99%
rename from tests/test_policy.py
rename to keystone/tests/test_policy.py
index 010a5abffa..bdf91c949e 100644
--- a/tests/test_policy.py
+++ b/keystone/tests/test_policy.py
@@ -19,7 +19,7 @@ import StringIO
 import tempfile
 import urllib2
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import exception
diff --git a/tests/test_s3_token_middleware.py b/keystone/tests/test_s3_token_middleware.py
similarity index 100%
rename from tests/test_s3_token_middleware.py
rename to keystone/tests/test_s3_token_middleware.py
diff --git a/tests/test_serializer.py b/keystone/tests/test_serializer.py
similarity index 99%
rename from tests/test_serializer.py
rename to keystone/tests/test_serializer.py
index 2024949bb2..260a533cf8 100644
--- a/tests/test_serializer.py
+++ b/keystone/tests/test_serializer.py
@@ -17,7 +17,7 @@
 import copy
 
 from keystone.common import serializer
-from keystone import test
+from keystone.tests import core as test
 
 
 class XmlSerializerTestCase(test.TestCase):
diff --git a/tests/test_singular_plural.py b/keystone/tests/test_singular_plural.py
similarity index 100%
rename from tests/test_singular_plural.py
rename to keystone/tests/test_singular_plural.py
diff --git a/tests/test_sizelimit.py b/keystone/tests/test_sizelimit.py
similarity index 98%
rename from tests/test_sizelimit.py
rename to keystone/tests/test_sizelimit.py
index abd2b639dc..a37b0e31f8 100644
--- a/tests/test_sizelimit.py
+++ b/keystone/tests/test_sizelimit.py
@@ -14,7 +14,7 @@
 
 import webob
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import exception
diff --git a/tests/test_sql_core.py b/keystone/tests/test_sql_core.py
similarity index 99%
rename from tests/test_sql_core.py
rename to keystone/tests/test_sql_core.py
index e60005f554..e3379152e1 100644
--- a/tests/test_sql_core.py
+++ b/keystone/tests/test_sql_core.py
@@ -14,7 +14,7 @@
 
 
 from keystone.common import sql
-from keystone import test
+from keystone.tests import core as test
 
 
 class CallbackMonitor:
diff --git a/tests/test_sql_migrate_extensions.py b/keystone/tests/test_sql_migrate_extensions.py
similarity index 100%
rename from tests/test_sql_migrate_extensions.py
rename to keystone/tests/test_sql_migrate_extensions.py
diff --git a/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py
similarity index 99%
rename from tests/test_sql_upgrade.py
rename to keystone/tests/test_sql_upgrade.py
index 9540c4cd7d..e904d6a752 100644
--- a/tests/test_sql_upgrade.py
+++ b/keystone/tests/test_sql_upgrade.py
@@ -15,8 +15,8 @@
 # under the License.
 """
 To run these tests against a live database:
-1. Modify the file `tests/backend_sql.conf` to use the connection for your
-   live database
+1. Modify the file `keystone/tests/backend_sql.conf` to use the connection for
+   your live database
 2. Set up a blank, live database.
 3. run the tests using
     ./run_tests.sh -N  test_sql_upgrade
@@ -32,7 +32,7 @@ import uuid
 from migrate.versioning import api as versioning_api
 import sqlalchemy
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import sql
 from keystone.common.sql import migration
diff --git a/tests/test_ssl.py b/keystone/tests/test_ssl.py
similarity index 99%
rename from tests/test_ssl.py
rename to keystone/tests/test_ssl.py
index 8de5cc1940..cb6b5fdc84 100644
--- a/tests/test_ssl.py
+++ b/keystone/tests/test_ssl.py
@@ -18,7 +18,7 @@
 import os
 import ssl
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import environment
 from keystone import config
diff --git a/tests/test_token_bind.py b/keystone/tests/test_token_bind.py
similarity index 99%
rename from tests/test_token_bind.py
rename to keystone/tests/test_token_bind.py
index 20488a9144..ae398ea1fd 100644
--- a/tests/test_token_bind.py
+++ b/keystone/tests/test_token_bind.py
@@ -15,7 +15,7 @@
 from keystone.common import wsgi
 from keystone import config
 from keystone import exception
-from keystone import test
+from keystone.tests import core as test
 
 CONF = config.CONF
 
diff --git a/tests/test_token_provider.py b/keystone/tests/test_token_provider.py
similarity index 99%
rename from tests/test_token_provider.py
rename to keystone/tests/test_token_provider.py
index a7e927173f..08fab35ddb 100644
--- a/tests/test_token_provider.py
+++ b/keystone/tests/test_token_provider.py
@@ -17,7 +17,7 @@
 import uuid
 
 from keystone import exception
-from keystone import test
+from keystone.tests import core as test
 from keystone import token
 
 
diff --git a/tests/test_url_middleware.py b/keystone/tests/test_url_middleware.py
similarity index 98%
rename from tests/test_url_middleware.py
rename to keystone/tests/test_url_middleware.py
index 2a36e8c2f5..436eb8d4cb 100644
--- a/tests/test_url_middleware.py
+++ b/keystone/tests/test_url_middleware.py
@@ -16,7 +16,7 @@
 
 import webob
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import middleware
 
diff --git a/tests/test_utils.py b/keystone/tests/test_utils.py
similarity index 98%
rename from tests/test_utils.py
rename to keystone/tests/test_utils.py
index 4a65bea1e7..19535a7be4 100644
--- a/tests/test_utils.py
+++ b/keystone/tests/test_utils.py
@@ -29,7 +29,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import utils
 
diff --git a/tests/test_uuid_token_provider.conf b/keystone/tests/test_uuid_token_provider.conf
similarity index 100%
rename from tests/test_uuid_token_provider.conf
rename to keystone/tests/test_uuid_token_provider.conf
diff --git a/tests/test_v3.py b/keystone/tests/test_v3.py
similarity index 99%
rename from tests/test_v3.py
rename to keystone/tests/test_v3.py
index 4f00de7d96..7db14c844a 100644
--- a/tests/test_v3.py
+++ b/keystone/tests/test_v3.py
@@ -4,13 +4,12 @@ import uuid
 from lxml import etree
 import webtest
 
-from keystone import test
-
 from keystone import auth
 from keystone.common import serializer
 from keystone import config
 from keystone.openstack.common import timeutils
 from keystone.policy.backends import rules
+from keystone.tests import core as test
 
 import test_content_types
 
diff --git a/tests/test_v3_auth.py b/keystone/tests/test_v3_auth.py
similarity index 99%
rename from tests/test_v3_auth.py
rename to keystone/tests/test_v3_auth.py
index 11d667008c..43f87d98de 100644
--- a/tests/test_v3_auth.py
+++ b/keystone/tests/test_v3_auth.py
@@ -19,7 +19,7 @@ from keystone import auth
 from keystone.common import cms
 from keystone import config
 from keystone import exception
-from keystone import test
+from keystone.tests import core as test
 
 import test_v3
 
diff --git a/tests/test_v3_catalog.py b/keystone/tests/test_v3_catalog.py
similarity index 100%
rename from tests/test_v3_catalog.py
rename to keystone/tests/test_v3_catalog.py
diff --git a/tests/test_v3_credential.py b/keystone/tests/test_v3_credential.py
similarity index 100%
rename from tests/test_v3_credential.py
rename to keystone/tests/test_v3_credential.py
diff --git a/tests/test_v3_identity.py b/keystone/tests/test_v3_identity.py
similarity index 100%
rename from tests/test_v3_identity.py
rename to keystone/tests/test_v3_identity.py
diff --git a/tests/test_v3_policy.py b/keystone/tests/test_v3_policy.py
similarity index 100%
rename from tests/test_v3_policy.py
rename to keystone/tests/test_v3_policy.py
diff --git a/tests/test_v3_protection.py b/keystone/tests/test_v3_protection.py
similarity index 100%
rename from tests/test_v3_protection.py
rename to keystone/tests/test_v3_protection.py
diff --git a/tests/test_versions.py b/keystone/tests/test_versions.py
similarity index 99%
rename from tests/test_versions.py
rename to keystone/tests/test_versions.py
index c5864c375b..933fb2462d 100644
--- a/tests/test_versions.py
+++ b/keystone/tests/test_versions.py
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import controllers
diff --git a/tests/test_wsgi.py b/keystone/tests/test_wsgi.py
similarity index 99%
rename from tests/test_wsgi.py
rename to keystone/tests/test_wsgi.py
index 362df922ff..781159e209 100644
--- a/tests/test_wsgi.py
+++ b/keystone/tests/test_wsgi.py
@@ -14,11 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone import test
-
 from keystone.common import wsgi
 from keystone import exception
 from keystone.openstack.common import jsonutils
+from keystone.tests import core as test
 
 
 class FakeApp(wsgi.Application):
diff --git a/keystone/tests/tmp/.gitkeep b/keystone/tests/tmp/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/run_tests.sh b/run_tests.sh
index f9b8b7c40f..19f3f0f4ac 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -95,10 +95,10 @@ fi
 
 function cleanup_test_db {
   # Default test settings will leave around some test*.db files
-  # TODO(termie): this could probably be moved into tests/__init__.py
+  # TODO(termie): this could probably be moved into keystone/tests/__init__.py
   #               but there have been some issues with creating that
   #               file for some users
-  rm -f tests/test*.db
+  rm -f keystone/tests/*.db
 }
 
 function run_tests {
diff --git a/setup.cfg b/setup.cfg
index 83d439631f..8bce3b3da3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -64,4 +64,4 @@ detailed-errors=1
 cover-package = keystone
 cover-html = true
 cover-erase = true
-where=tests
+where=keystone/tests