Merge branch 'master' into bugfix/overriden-hooks-exec-order

Author: vkarak

docs/config_reference.rst

@@ -1219,9 +1219,9 @@ The additional properties for the ``filelog`` handler are the following:
      {basedir}/
         system1/
             partition1/
-                test_short_name.log
+                <test_class_name>.log
             partition2/
-                test_short_name.log
+                <test_class_name>.log
             ...
         system2/
         ...
@@ -1241,6 +1241,12 @@ The additional properties for the ``filelog`` handler are the following:
    Examples of changes in the logged information are when the log record format changes or a new performance metric is added, deleted or has its name changed.
    This behavior guarantees that each log file is consistent and it will not break existing parsers.
 
+.. versionchanged:: 4.3
+
+   In the generated log file, the name of the test class name is used instead of the test's short name (which included the test's hash).
+   This allows the results of different variants of a parameterized test to be stored in the same log file facilitating post-processing.
+
+
 The ``graylog`` log handler
 ---------------------------
 

reframe/frontend/autodetect.py

@@ -59,6 +59,9 @@ def __enter__(self):
                     shutil.copy2(src, self._workdir)
         except FileNotFoundError:
             use_pip = True
+        except Exception as err:
+            osext.rmtree(self._workdir)
+            raise err
 
         return self._workdir, use_pip
 

reframe/utility/__init__.py

@@ -1275,6 +1275,9 @@ def __delitem__(self, key):
     def __missing__(self, key):
         raise KeyError(str(key))
 
+    def __rfm_json_encode__(self):
+        return self.data
+
 
 @functools.total_ordering
 class OrderedSet(collections.abc.MutableSet):

unittests/test_utility.py

@@ -799,7 +799,6 @@ def test_scoped_dict_construction():
         'a': {'k1': 3, 'k2': 4},
         'b': {'k3': 5}
     }
-    namespace_dict = reframe.utility.ScopedDict()
     namespace_dict = reframe.utility.ScopedDict(d)
 
     # Change local dict and verify that the stored values are not affected
@@ -1088,6 +1087,17 @@ def test_scoped_dict_update():
     assert scoped_dict == scoped_dict_alt
 
 
+def test_scoped_dict_json_enc():
+    import json
+
+    d = {
+        'a': {'k1': 3, 'k2': 4},
+        'b': {'k3': 5}
+    }
+    ns_dict = reframe.utility.ScopedDict(d)
+    assert d == json.loads(jsonext.dumps(ns_dict))
+
+
 def test_sequence_view():
     l = util.SequenceView([1, 2, 2])
     assert 1 == l[0]