Fix config tests: reinstantiate singleton

GeoscienceAustralia · May 8, 2019 · 53733c1 · 53733c1
1 parent dca8c3b
commit 53733c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Utilities/config.py b/Utilities/config.py
@@ -314,6 +314,10 @@ def set(self, section, option, value=None):
 singleton = _ConfigParser(defaults=DEFAULTS)
 def ConfigParser():
     return singleton
+def reset():
+    """Re-instantiate ConfigParser (only for use in tests)"""
+    global singleton
+    singleton = _ConfigParser(defaults=DEFAULTS)
 
 def cnfGetIniValue(configFile, section, option, default=None):
     """

diff --git a/tests/test_columns.py b/tests/test_columns.py
@@ -8,10 +8,12 @@
 unittest_dir = pathLocate.getUnitTestDirectory()
 
 import Utilities.columns as columns
+from Utilities import config
 
 class TestReadCSV(unittest.TestCase):
 
     def setUp(self):
+        config.reset()
         self.configFile = pjoin(unittest_dir, 'test_data','test_cols.ini')
         self.inputFile = pjoin(unittest_dir, 'test_data','test_cols.csv')
         self.source = 'TEST'
@@ -22,6 +24,8 @@ def setUp(self):
                                   dtype=[('A', float),
                                          ('B', float),
                                          ('C', int)])
+    def tearDown(self):
+        config.reset()
 
     def test_badinput(self):
         self.assertRaises(IOError, columns.colReadCSV,

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -5,7 +5,7 @@
 
 #from Utilities
 import Utilities.config as config #.config import ConfigParser, cnfGetIniValue, parseBool, parseList, formatList
-from Utilities.singleton import forgetAllSingletons
+from Utilities.config import reset as forgetAllSingletons
 import pathLocate
 
 unittest_dir = pathLocate.getUnitTestDirectory()