From 4ec92cb9e7d1eb2f90d36e5255ee8814ca0a8513 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 22 Oct 2014 11:03:48 -0500 Subject: Options: ensure macros are always fixed up This fixes several cases in which 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. --- testsuite/Testsrc/Testlib/TestOptions/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'testsuite/Testsrc/Testlib/TestOptions/__init__.py') 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() -- cgit v1.2.3-1-g7c22