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

@@ -24,6 +24,6 @@ build/
 dist/
 etc/keystone.conf
 etc/logging.conf
-tests/tmp/
+keystone/tests/tmp/
 .project
 .pydevproject

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

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
+through the ``keystone/tests`` directory, using Nosetest to collect the tests
-invoke them using an OpenStack custom test running that displays 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

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
 

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
 

keystone/tests/backend_ldap_sql.conf

@@ -34,3 +34,4 @@ driver = keystone.policy.backends.sql.Policy
 
 [trust]
 driver = keystone.trust.backends.sql.Trust
+

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')
 

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

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

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

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

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

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

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

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

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
 

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

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

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

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

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

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

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

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

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
 

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
 

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

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():

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
+certfile = ../../examples/pki/certs/signing_cert.pem
-keyfile = ../examples/pki/private/signing_key.pem
+keyfile = ../../examples/pki/private/signing_key.pem
-ca_certs = ../examples/pki/certs/cacert.pem
+ca_certs = ../../examples/pki/certs/cacert.pem

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

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):

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

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:

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
+1. Modify the file `keystone/tests/backend_sql.conf` to use the connection for
-   live database
+   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

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

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
 

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
 
 

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
 

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
 

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
 

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
 

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

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):

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 {

setup.cfg

@@ -64,4 +64,4 @@ detailed-errors=1
 cover-package = keystone
 cover-html = true
 cover-erase = true
-where=tests
+where=keystone/tests