Merge pull request #2546 from vkarak/bugfix/runreport-treat-undefined-vars

[bugfix] Treat undefined variables correctly in run report

Author: Vasileios Karakasis

reframe/frontend/statistics.py

@@ -196,7 +196,10 @@ def json(self, force=False):
                 test_cls = type(check)
                 for name, var in test_cls.var_space.items():
                     if var.is_loggable():
-                        entry['check_vars'][name] = getattr(check, name)
+                        try:
+                            entry['check_vars'][name] = getattr(check, name)
+                        except AttributeError:
+                            entry['check_vars'][name] = '<undefined>'
 
                 entry['check_params'] = {}
                 test_cls = type(check)

unittests/resources/checks/frontend_checks.py

@@ -23,6 +23,15 @@ class BaseFrontendCheck(rfm.RunOnlyRegressionTest):
     executable = 'echo hello && echo perf: 10 Gflop/s'
     local = True
 
+    # Add two required variables that may affect the final run report
+    x = variable(int)
+    xlog = variable(int, loggable=True)
+
+    @run_after('setup')
+    def setx(self):
+        self.x = 1
+        self.xlog = 1
+
     @sanity_function
     def validate_output(self):
         return sn.assert_found('hello', self.stdout)

unittests/test_schedulers.py

@@ -616,6 +616,7 @@ def _read_pid(job, attempts=3):
                 f'{attempts} attempts')
 
 
+@pytest.mark.flaky(reruns=3)
 def test_cancel_with_grace(minimal_job, scheduler, local_only):
     # This test emulates a spawned process that ignores the SIGTERM signal
     # and also spawns another process: