summaryrefslogtreecommitdiffstats
path: root/testsuite/Testsrc/Testlib/TestOptions/__init__.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-10-22 11:03:48 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-11-10 17:35:43 -0600
commit4ec92cb9e7d1eb2f90d36e5255ee8814ca0a8513 (patch)
treef375d640c4f4e004600a1c3f7316a7d167e2f328 /testsuite/Testsrc/Testlib/TestOptions/__init__.py
parent72201ddac165e45da09521b77660b2e155ca36cd (diff)
downloadbcfg2-4ec92cb9e7d1eb2f90d36e5255ee8814ca0a8513.tar.gz
bcfg2-4ec92cb9e7d1eb2f90d36e5255ee8814ca0a8513.tar.bz2
bcfg2-4ec92cb9e7d1eb2f90d36e5255ee8814ca0a8513.zip
Options: ensure <repository> macros are always fixed up
This fixes several cases in which <repository> macros would not be properly processed: options that are not added to the parser yet when early options are parsed; and config file options whose default value is used.
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestOptions/__init__.py')
-rw-r--r--testsuite/Testsrc/Testlib/TestOptions/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/testsuite/Testsrc/Testlib/TestOptions/__init__.py b/testsuite/Testsrc/Testlib/TestOptions/__init__.py
index 688f4e54c..ca2c41359 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/__init__.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/__init__.py
@@ -4,7 +4,7 @@ import os
import tempfile
from Bcfg2.Compat import wraps, ConfigParser
-from Bcfg2.Options import Parser
+from Bcfg2.Options import Parser, PathOption
from testsuite.common import Bcfg2TestCase
@@ -75,7 +75,10 @@ class OptionTestCase(Bcfg2TestCase):
Parser.unit_test = False
Bcfg2TestCase.setUpClass()
+ def setUp(self):
+ Bcfg2TestCase.setUp(self)
+ PathOption.repository = None
+
@classmethod
def tearDownClass(cls):
Parser.unit_test = True
- Bcfg2TestCase.tearDownClass()