Merge "Remove test dep on name of dir (bug 1124283)"
This commit is contained in:
@@ -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):
|
||||
|
@@ -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')
|
||||
|
Reference in New Issue
Block a user