Merge branch 'master' into doc/system-variables

Author: Vasileios Karakasis

reframe/core/runtime.py

@@ -162,13 +162,17 @@ def modules_system(self):
         '''
         return self._system.modules_system
 
-    def get_option(self, option):
+    def get_option(self, option, default=None):
         '''Get a configuration option.
 
         :arg option: The option to be retrieved.
+        :arg default: The value to return if ``option`` cannot be retrieved.
         :returns: The value of the option.
+
+        .. versionchanged:: 3.11.0
+          Add ``default`` named argument.
         '''
-        return self._site_config.get(option)
+        return self._site_config.get(option, default=default)
 
 
 # Global resources for the current host

reframe/core/schedulers/slurm.py

@@ -502,25 +502,25 @@ def _do_cancel_if_blocked(self, job, reason_descr):
                 if node_match:
                     node_names = node_match['node_names']
                     if node_names:
-                        # Retrieve the info of the unavailable nodes
-                        # and check if they are indeed down
+                        # Retrieve the info of the unavailable nodes and check
+                        # if they are indeed down. According to Slurm's docs
+                        # this should not be necessary, but we check anyways
+                        # to be on the safe side.
                         self.log(f'Checking if nodes {node_names!r} '
                                  f'are indeed unavailable')
                         nodes = self._get_nodes_by_name(node_names)
                         if not any(n.is_down() for n in nodes):
                             return
-                    else:
-                        # List of unavailable nodes is empty; assume job
-                        # is pending
-                        return
 
-            self.cancel(job)
-            reason_msg = ('job cancelled because it was blocked due to '
-                          'a perhaps non-recoverable reason: ' + reason)
-            if reason_details is not None:
-                reason_msg += ', ' + reason_details
+                        self.cancel(job)
+                        reason_msg = (
+                            'job cancelled because it was blocked due to '
+                            'a perhaps non-recoverable reason: ' + reason
+                        )
+                        if reason_details is not None:
+                            reason_msg += ', ' + reason_details
 
-            job._exception = JobBlockedError(reason_msg, job.jobid)
+                        job._exception = JobBlockedError(reason_msg, job.jobid)
 
     def wait(self, job):
         # Quickly return in case we have finished already

reframe/frontend/cli.py

@@ -772,8 +772,11 @@ def restrict_logging():
         if config_param == 'all':
             printer.info(str(rt.site_config))
         else:
-            value = rt.get_option(config_param)
-            if value is None:
+            # Create a unique value to differentiate between configuration
+            # parameters with value `None` and invalid ones
+            default = {'token'}
+            value = rt.get_option(config_param, default)
+            if value is default:
                 printer.error(
                     f'no such configuration parameter found: {config_param}'
                 )

reframe/schemas/config.json

@@ -571,6 +571,7 @@
         "systems/partitions/max_jobs": 8,
         "systems/partitions/prepare_cmds": [],
         "systems/partitions/processor": {},
+        "systems/partitions/time_limit": null,
         "systems/partitions/devices": [],
         "systems/partitions/extras": {}
     }

unittests/test_cli.py

@@ -620,6 +620,17 @@ def test_show_config_unknown_param(run_reframe):
     assert returncode == 0
 
 
+def test_show_config_null_param(run_reframe):
+    returncode, stdout, stderr = run_reframe(
+        more_options=['--show-config=general/report_junit'],
+        system='testsys'
+    )
+    assert 'null' in stdout
+    assert 'Traceback' not in stdout
+    assert 'Traceback' not in stderr
+    assert returncode == 0
+
+
 def test_verbosity(run_reframe):
     returncode, stdout, stderr = run_reframe(
         more_options=['-vvvvv'],