openstack/python-keystoneclient
Code Issues Proposed changes

Remove test dep on name of dir (bug 1124283)

Browse Source 
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
This commit is contained in:
Dolph Mathews
2013-02-13 10:05:49 -06:00
parent 3ce3fe80cb
commit 9196be6664
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/middleware/test.py
View File

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

8
tests/test_auth_token_middleware.py
View File

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