openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Remove test dep on name of dir (bug 1124283)"

Browse Source
This commit is contained in:
Jenkins
2013-03-07 22:05:34 +00:00
committed by Gerrit Code Review
parent c017ba9819 9196be6664
commit f46aea4e96
2 changed files with 4 additions and 4 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 import sys
ROOTDIR = os.path.dirname(os.path.abspath(os.curdir)) ROOTDIR = os.path.abspath(os.curdir)
def rootdir(*p): def rootdir(*p):

6
tests/test_auth_token_middleware.py
View File

@@ -33,9 +33,9 @@ from keystoneclient.openstack.common import timeutils
from keystoneclient.middleware import test from keystoneclient.middleware import test
CERTDIR = test.rootdir("python-keystoneclient/examples/pki/certs") CERTDIR = test.rootdir('examples', 'pki', 'certs')
KEYDIR = test.rootdir("python-keystoneclient/examples/pki/private") KEYDIR = test.rootdir('examples', 'pki', 'private')
CMSDIR = test.rootdir("python-keystoneclient/examples/pki/cms") CMSDIR = test.rootdir('examples', 'pki', 'cms')
SIGNING_CERT = os.path.join(CERTDIR, 'signing_cert.pem') SIGNING_CERT = os.path.join(CERTDIR, 'signing_cert.pem')
SIGNING_KEY = os.path.join(KEYDIR, 'signing_key.pem') SIGNING_KEY = os.path.join(KEYDIR, 'signing_key.pem')
CA = os.path.join(CERTDIR, 'ca.pem') CA = os.path.join(CERTDIR, 'ca.pem')