Properly restore runtime in test_policies.py unit tests

Author: Vasileios Karakasis

reframe/core/pipeline.py

@@ -767,7 +767,6 @@ def __new__(cls, *args, _rfm_use_params=False, **kwargs):
                     )
 
         # Attach the hooks to the pipeline stages
-        print(cls._rfm_pipeline_hooks)
         for stage in _PIPELINE_STAGES:
             cls._add_hooks(stage)
 

unittests/test_cli.py

@@ -108,10 +108,11 @@ def _run_reframe(system='generic:default',
 
 @pytest.fixture
 def temp_runtime(tmp_path):
-    def _temp_runtime(site_config, system=None, options={}):
+    def _temp_runtime(site_config, system=None, options=None):
+        options = options or {}
         options.update({'systems/prefix': tmp_path})
         with rt.temp_runtime(site_config, system, options):
-            yield rt.runtime
+            yield
 
     yield _temp_runtime
 

unittests/test_dependencies.py

@@ -85,10 +85,11 @@ def find_case(cname, ename, partname, cases):
 
 @pytest.fixture
 def temp_runtime(tmp_path):
-    def _temp_runtime(site_config, system=None, options={}):
+    def _temp_runtime(site_config, system=None, options=None):
+        options = options or {}
         options.update({'systems/prefix': tmp_path})
         with rt.temp_runtime(site_config, system, options):
-            yield rt.runtime
+            yield
 
     yield _temp_runtime
 

unittests/test_logging.py

@@ -226,7 +226,7 @@ def _temp_runtime(logging_config):
             fp.write(f'site_configuration = {util.ppretty(site_config)}')
 
         with rt.temp_runtime(fp.name):
-            yield rt.runtime()
+            yield
 
     return _temp_runtime
 

unittests/test_pipeline.py

@@ -56,10 +56,11 @@ def pinnedtest():
 
 @pytest.fixture
 def temp_runtime(tmp_path):
-    def _temp_runtime(config_file, system=None, options={}):
+    def _temp_runtime(config_file, system=None, options=None):
+        options = options or {}
         options.update({'systems/prefix': str(tmp_path)})
         with rt.temp_runtime(config_file, system, options):
-            yield rt.runtime()
+            yield
 
     yield _temp_runtime
 

unittests/test_policies.py

@@ -63,10 +63,11 @@ def timestamps(self):
 
 @pytest.fixture
 def temp_runtime(tmp_path):
-    def _temp_runtime(site_config, system=None, options={}):
+    def _temp_runtime(site_config, system=None, options=None):
+        options = options or {}
         options.update({'systems/prefix': str(tmp_path)})
         with rt.temp_runtime(site_config, system, options):
-            yield rt.runtime
+            yield
 
     yield _temp_runtime
 
@@ -819,6 +820,9 @@ def test_compile_fail_reschedule_main_loop(async_runner, make_cases,
     assert_runall(runner)
     assert num_checks == len(stats.failed())
 
+    with contextlib.suppress(StopIteration):
+        next(ctx)
+
 
 def test_compile_fail_reschedule_busy_loop(async_runner, make_cases,
                                            make_async_exec_ctx):
@@ -834,6 +838,8 @@ def test_compile_fail_reschedule_busy_loop(async_runner, make_cases,
     assert num_checks == stats.num_cases()
     assert_runall(runner)
     assert num_checks == len(stats.failed())
+    with contextlib.suppress(StopIteration):
+        next(ctx)
 
 
 @pytest.fixture
@@ -875,8 +881,12 @@ def test_restore_session(report_file, make_runner,
     assert new_report['runs'][0]['testcases'][0]['name'] == 'T1'
 
     # Remove the test case dump file and retry
-    os.remove(tmp_path / 'stage' / 'generic' / 'default' /
-              'builtin' / 'T4' / '.rfm_testcase.json')
+    try:
+        os.remove(tmp_path / 'stage' / 'generic' / 'default' /
+                  'builtin' / 'T4' / '.rfm_testcase.json')
+    except OSError:
+        import reframe.utility as util
+        print('==> dep_cases', util.repr(dep_cases))
 
     with pytest.raises(ReframeError, match=r'could not restore testcase'):
         report.restore_dangling(testgraph)

unittests/test_schedulers.py

@@ -45,10 +45,11 @@ def local_only(scheduler):
 
 @pytest.fixture
 def temp_runtime(tmp_path):
-    def _temp_runtime(site_config, system=None, options={}):
+    def _temp_runtime(site_config, system=None, options=None):
+        options = options or {}
         options.update({'systems/prefix': tmp_path})
         with rt.temp_runtime(site_config, system, options):
-            yield rt.runtime
+            yield
 
     yield _temp_runtime
 

unittests/test_utility.py

@@ -1442,10 +1442,11 @@ def test_cray_cle_info_missing_parts(tmp_path):
 
 @pytest.fixture
 def temp_runtime(tmp_path):
-    def _temp_runtime(site_config, system=None, options={}):
+    def _temp_runtime(site_config, system=None, options=None):
+        options = options or {}
         options.update({'systems/prefix': tmp_path})
-        with rt.temp_runtime(site_config, system, options) as ctx:
-            yield ctx
+        with rt.temp_runtime(site_config, system, options):
+            yield
 
     yield _temp_runtime