#66: Make tests working

src/core/rkd/core/api/testing.py

@@ -74,17 +74,22 @@ class BasicTestingCase(TestCase):
 
     _envs = None
     _cwd = None
+    should_backup_env = True
 
     def setUp(self) -> None:
         os.environ['RKD_PATH'] = ''
 
-        self._envs = deepcopy(os.environ)
+        if self.should_backup_env:
+            self._envs = deepcopy(os.environ)
+
         self._cwd = os.getcwd()
 
         super().setUp()
 
     def tearDown(self) -> None:
-        os.environ = self._envs
+        if self.should_backup_env:
+            os.environ = deepcopy(self._envs)
+
         os.chdir(self._cwd)
 
         super().tearDown()
@@ -110,7 +115,7 @@ def environment(self, environ: dict):
             os.environ.update(environ)
             yield
         finally:
-            os.environ = backup
+            os.environ = deepcopy(backup)
 
     @staticmethod
     def satisfy_task_dependencies(task: TaskInterface, io: IO = None) -> TaskInterface:

src/core/tests/test_argparsing.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
-
+import os
 from argparse import ArgumentParser
+from unittest import mock
+
 from rkd.core.api.inputoutput import IO, BufferedSystemIO
 from rkd.core.api.testing import BasicTestingCase
 from rkd.core.argparsing.parser import CommandlineParsingHelper
@@ -9,6 +11,8 @@
 
 
 class ArgParsingTest(BasicTestingCase):
+    should_backup_env = False
+
     def test_creates_grouped_arguments_into_tasks__task_after_flag(self):
         """ Test parsing arguments """
 
@@ -214,18 +218,18 @@ def test_preparse_global_arguments_before_tasks_parses_imports_from_switch(self)
             result['imports']
         )
 
+    @mock.patch.dict(os.environ, {"RKD_IMPORTS": "bakunin:malatesta"}, clear=True)
     def test_preparse_global_arguments_before_tasks_parses_imports_from_env(self):
-        with self.environment({'RKD_IMPORTS': 'bakunin:malatesta'}):
-            result = CommandlineParsingHelper.preparse_global_arguments_before_tasks([])
+        result = CommandlineParsingHelper.preparse_global_arguments_before_tasks([])
 
         self.assertEqual(
             ['bakunin', 'malatesta'],
             result['imports']
         )
 
+    @mock.patch.dict(os.environ, {"RKD_SYS_LOG_LEVEL": "internal"}, clear=True)
     def test_preparse_global_arguments_before_tasks_reacts_on_sys_log_level_env(self):
-        with self.environment({'RKD_SYS_LOG_LEVEL': 'internal'}):
-            result = CommandlineParsingHelper.preparse_global_arguments_before_tasks([])
+        result = CommandlineParsingHelper.preparse_global_arguments_before_tasks([])
 
         self.assertEqual(
             'internal',