From 9196be6664b453cced316842ba9d67caa389517a Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Wed, 13 Feb 2013 10:05:49 -0600 Subject: [PATCH] Remove test dep on name of dir (bug 1124283) The name of the project's directory was previously hardcoded into the tests, so tests would fail if executed from another directory (such as "python-keystoneclient-master", as checked-out by keystone for integration testing). Also, the tests should now be executable on Windows. Change-Id: I0a1e052054e509b0f795fd13f95a804e0c255907 --- keystoneclient/middleware/test.py | 2 +- tests/test_auth_token_middleware.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/keystoneclient/middleware/test.py b/keystoneclient/middleware/test.py index e5c117120..77511412c 100644 --- a/keystoneclient/middleware/test.py +++ b/keystoneclient/middleware/test.py @@ -22,7 +22,7 @@ import os import sys -ROOTDIR = os.path.dirname(os.path.abspath(os.curdir)) +ROOTDIR = os.path.abspath(os.curdir) def rootdir(*p): diff --git a/tests/test_auth_token_middleware.py b/tests/test_auth_token_middleware.py index dd608595e..ef0d7a268 100644 --- a/tests/test_auth_token_middleware.py +++ b/tests/test_auth_token_middleware.py @@ -33,9 +33,9 @@ from keystoneclient.openstack.common import timeutils from keystoneclient.middleware import test -CERTDIR = test.rootdir("python-keystoneclient/examples/pki/certs") -KEYDIR = test.rootdir("python-keystoneclient/examples/pki/private") -CMSDIR = test.rootdir("python-keystoneclient/examples/pki/cms") +CERTDIR = test.rootdir('examples', 'pki', 'certs') +KEYDIR = test.rootdir('examples', 'pki', 'private') +CMSDIR = test.rootdir('examples', 'pki', 'cms') SIGNING_CERT = os.path.join(CERTDIR, 'signing_cert.pem') SIGNING_KEY = os.path.join(KEYDIR, 'signing_key.pem') CA = os.path.join(CERTDIR, 'ca.pem') @@ -390,8 +390,6 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase): valid_signed_list = 'VALID_SIGNED_REVOCATION_LIST' globals()[signed_list] = globals()[valid_signed_list] - super(BaseAuthTokenMiddlewareTest, self).setUp() - def tearDown(self): super(BaseAuthTokenMiddlewareTest, self).tearDown() try: