Mangle session scope fixture names

Author: jjotero

reframe/core/fixtures.py

@@ -98,6 +98,9 @@ def __init__(self):
             'general/0/compact_test_names'
         )
 
+        # Store the system name for name-mangling purposes
+        self._sys_name = runtime.runtime().system.name
+
     def add(self, fixture, variant_num, parent_name, partitions, prog_envs):
         '''Register a fixture.
 
@@ -173,7 +176,7 @@ def add(self, fixture, variant_num, parent_name, partitions, prog_envs):
         # Register the fixture
         if scope == 'session':
             # The name is just the class name
-            name = fname
+            name = f'{fname}~{self._sys_name}'
 
             # Select a valid environment supported by a partition
             for part in valid_partitions:

unittests/resources/checks_unlisted/fixtures_simple.py

@@ -17,6 +17,12 @@ def assert_output(self):
         return sn.assert_found(r'hello from fixture', self.stdout)
 
 
+@rfm.simple_test
+class HelloTest(HelloFixture):
+    valid_systems = ['*']
+    valid_prog_environs = ['*']
+
+
 @rfm.simple_test
 class TestA(rfm.RunOnlyRegressionTest):
     valid_systems = ['*']
@@ -36,4 +42,5 @@ def inspect_fixture(self):
 
 @rfm.simple_test
 class TestB(TestA):
-    pass
+    '''Use a test as a fixture'''
+    ff = fixture(HelloTest, scope='session')

unittests/test_loader.py

@@ -70,7 +70,7 @@ def test_load_fixtures(loader):
     tests = loader.load_from_file(
         'unittests/resources/checks_unlisted/fixtures_simple.py'
     )
-    assert 3 == len(tests)
+    assert 5 == len(tests)
 
 
 def test_special_test():