blob: b7e74cd25821f98d7103548642aa4c05982f152a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From 3364915002aa2deaf63841e338375648e5dc8f24 Mon Sep 17 00:00:00 2001
From: Keith Holman <Keith.Holman@windriver.com>
Date: Fri, 13 Jun 2014 13:46:04 -0400
Subject: [PATCH] barbican: fix path to find configuration files
Barbican attempts to find configuration files for tests based on where
the files are located within the source tree. On deployment,
configuration files are installed to a directory specified by a build
recipe. This fix updates the location for the configuration files
with an identifier that is replaced during deployment.
Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
---
barbican/tests/api/test_resources_policy.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/barbican/tests/api/test_resources_policy.py b/barbican/tests/api/test_resources_policy.py
index 5c75bc3..f2332f6 100644
--- a/barbican/tests/api/test_resources_policy.py
+++ b/barbican/tests/api/test_resources_policy.py
@@ -37,8 +37,7 @@ from barbican.tests import utils
CONF = cfg.CONF
# Point to the policy.json file located in source control.
-TEST_VAR_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
- '../../../etc', 'barbican'))
+TEST_VAR_DIR = "%BARBICAN_CONF_DIR%"
ENFORCER = policy.Enforcer(CONF)
|
