Merge pull request #1378 from dmach/fix-tests-oscrc

Fix (lack of) loading oscrc in tests
openSUSE · Aug 9, 2023 · 391abc2 · 391abc2
2 parents b36c210 + 7ad815a
commit 391abc2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/tests/common.py b/tests/common.py
@@ -220,6 +220,7 @@ def tearDown(self):
             shutil.rmtree(self.tmpdir)
         except:
             pass
+        os.environ.pop("OSC_CONFIG", "")
         self.assertTrue(len(EXPECTED_REQUESTS) == 0)
 
     def _get_fixtures_dir(self):

diff --git a/tests/test_conf.py b/tests/test_conf.py
@@ -1,9 +1,13 @@
 import importlib
+import os
 import unittest
 
 import osc.conf
 
 
+FIXTURES_DIR = os.path.join(os.path.dirname(__file__), "conf_fixtures")
+
+
 class TestConf(unittest.TestCase):
     def setUp(self):
         # reset the global `config` in preparation for running the tests
@@ -13,6 +17,9 @@ def tearDown(self):
         # reset the global `config` to avoid impacting tests from other classes
         importlib.reload(osc.conf)
 
+    def _get_fixtures_dir(self):
+        return FIXTURES_DIR
+
     def test_bool_opts_defaults(self):
         config = osc.conf.config
         for opt in osc.conf._boolean_opts:
@@ -28,15 +35,17 @@ def test_int_opts_defaults(self):
             self.assertIsInstance(config[opt], int, msg=f"option: '{opt}'")
 
     def test_bool_opts(self):
-        osc.conf.get_config()
+        oscrc = os.path.join(self._get_fixtures_dir(), "oscrc")
+        osc.conf.get_config(override_conffile=oscrc, override_no_keyring=True)
         config = osc.conf.config
         for opt in osc.conf._boolean_opts:
             if opt not in config:
                 continue
             self.assertIsInstance(config[opt], bool, msg=f"option: '{opt}'")
 
     def test_int_opts(self):
-        osc.conf.get_config()
+        oscrc = os.path.join(self._get_fixtures_dir(), "oscrc")
+        osc.conf.get_config(override_conffile=oscrc, override_no_keyring=True)
         config = osc.conf.config
         for opt in osc.conf._integer_opts:
             if opt not in config:

diff --git a/tests/test_grabber.py b/tests/test_grabber.py
@@ -7,12 +7,16 @@
 import osc.grabber as osc_grabber
 
 
+FIXTURES_DIR = os.path.join(os.path.dirname(__file__), "conf_fixtures")
+
+
 class TestMirrorGroup(unittest.TestCase):
     def setUp(self):
         self.tmpdir = tempfile.mkdtemp(prefix='osc_test')
         # reset the global `config` in preparation for running the tests
         importlib.reload(osc.conf)
-        osc.conf.get_config()
+        oscrc = os.path.join(self._get_fixtures_dir(), "oscrc")
+        osc.conf.get_config(override_conffile=oscrc, override_no_keyring=True)
 
     def tearDown(self):
         # reset the global `config` to avoid impacting tests from other classes
@@ -22,6 +26,9 @@ def tearDown(self):
         except:
             pass
 
+    def _get_fixtures_dir(self):
+        return FIXTURES_DIR
+
     def test_invalid_scheme(self):
         gr = osc_grabber.OscFileGrabber()
         mg = osc_grabber.OscMirrorGroup(gr, ["container://example.com"])