Address PR comments

Signed-off-by: Theofilos Manitaras <[email protected]>

Author: Theofilos Manitaras

reframe/frontend/loader.py

@@ -189,7 +189,7 @@ def load_from_module(self, module):
                 self._loaded[c.unique_name] = testfile
                 final_tests.append(c)
             else:
-                if testfile != conflicted:
+                if not c.is_fixture():
                     raise NameConflictError(
                         f'test {c.unique_name!r} from {testfile!r} '
                         f'is already defined in {conflicted!r}'

unittests/resources/checks_unlisted/parameter_simple.py

@@ -0,0 +1,16 @@
+# Copyright 2016-2022 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+
+@rfm.simple_test
+class SimpleParameter(rfm.RunOnlyRegressionTest):
+    message = parameter(['foo', 'bar'])
+    valid_systems = ['*']
+    valid_prog_environs = ['*']
+    executable = 'echo'
+    sanity_patterns = sn.assert_true(1)

unittests/resources/checks_unlisted/testlib_inheritance_bar.py

@@ -4,15 +4,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 import reframe as rfm
-import reframe.utility.sanity as sn
 
-from testlib.simple import simple_check
+from testlib.simple import simple_echo_check
 
 
 @rfm.simple_test
-class HelloBar(simple_check):
-    executable_opts = ['Bar']
-
-    @sanity_function
-    def assert_output(self):
-        return sn.assert_found(r'Hello Bar', self.stdout)
+class HelloBar(simple_echo_check):
+    message = 'Bar'

unittests/resources/checks_unlisted/testlib_inheritance_foo.py

@@ -4,15 +4,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 import reframe as rfm
-import reframe.utility.sanity as sn
 
-from testlib.simple import simple_check
+from testlib.simple import simple_echo_check
 
 
 @rfm.simple_test
-class HelloFoo(simple_check):
-    executable_opts = ['Foo']
-
-    @sanity_function
-    def assert_output(self):
-        return sn.assert_found(r'Hello Foo', self.stdout)
+class HelloFoo(simple_echo_check):
+    message = 'Foo'

unittests/resources/testlib/simple.py

@@ -9,31 +9,31 @@
 import reframe.utility.sanity as sn
 
 
-class simple_make_build(rfm.CompileOnlyRegressionTest, pin_prefix=True):
-    descr = 'Simple Make build fixture'
-    sourcesdir = 'src'
-    build_system = 'Make'
+class simple_echo(rfm.RunOnlyRegressionTest, pin_prefix=True):
+    descr = 'Simple Echo build fixture'
+    executable = 'echo'
+    executable_opts = ['Hello']
 
     @sanity_function
     def assert_success(self):
-        return sn.assert_not_found(r'\S+', self.stderr)
+        return sn.assert_found(r'Hello', self.stdout)
 
 
 @rfm.simple_test
-class simple_check(rfm.RunOnlyRegressionTest):
-    descr = 'Simple test'
+class simple_echo_check(rfm.RunOnlyRegressionTest):
+    descr = 'Simple Echo Test'
     valid_systems = ['*']
     valid_prog_environs = ['builtin']
-    executable = 'hello.x'
-    executable_opts = ['World']
-
-    hello_binaries = fixture(simple_make_build, scope='environment')
+    executable = 'echo'
+    message = variable(str, value='World') 
+    hello_output = fixture(simple_echo, scope='environment')
 
     @run_before('run')
     def add_exec_prefix(self):
-        self.executable = os.path.join(self.hello_binaries.stagedir,
-                                       self.executable)
+        fixture_output = os.path.join(self.hello_output.stagedir,
+                                      str(self.hello_output.stdout))
+        self.executable_opts = [f'$(cat {fixture_output})', self.message]
 
     @sanity_function
     def assert_sanity(self):
-        return sn.assert_found(r'Hello World', self.stdout)
+        return sn.assert_found(rf'Hello {self.message}', self.stdout)

unittests/resources/testlib/src/Makefile

@@ -1047,7 +1047,7 @@ def test_dynamic_tests_filtering(run_reframe, tmp_path):
     assert 'FAILED' not in stdout
 
 
-def test_testlib_inherit_in_different_files(run_reframe, monkeypatch):
+def test_testlib_inherit_fixture_in_different_files(run_reframe, monkeypatch):
     monkeypatch.syspath_prepend('unittests/resources')
     returncode, stdout, _ = run_reframe(
         checkpath=[