[bugfix] Fix error when more than one instance of the same fixture cl…

…ass are specified

reframe/core/pipeline.py

@@ -1646,7 +1646,9 @@ def _resolve_fixtures(self):
             # registered under the same fixture class. So the loop below must
             # also inspect the fixture data the instance was registered with.
             for fixt_name, fixt_data in registry[f.cls].items():
-                if f.scope != fixt_data.scope:
+                if fixt_data.variables != f.variables:
+                    continue
+                elif f.scope != fixt_data.scope:
                     continue
                 elif fixt_data.variant_num not in target_variants:
                     continue

unittests/resources/checks_unlisted/fixtures_same_class.py

@@ -0,0 +1,33 @@
+# Copyright 2016-2024 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
+
+
+class HelloFixture(rfm.RunOnlyRegressionTest):
+    executable = 'echo hello from fixture'
+    myvar = variable(str)
+
+    @sanity_function
+    def assert_output(self):
+        return sn.assert_found(r'hello from fixture', self.stdout)
+
+
+@rfm.simple_test
+class TestA(rfm.RunOnlyRegressionTest):
+    valid_systems = ['*']
+    valid_prog_environs = ['*']
+
+    dep1 = fixture(HelloFixture, scope='environment', variables={'myvar': 'a'})
+    dep2 = fixture(HelloFixture, scope='environment', variables={'myvar': 'b'})
+
+    @run_after('setup')
+    def after_setup(self):
+        self.executable = f"echo {self.dep1.myvar} {self.dep2.myvar}"
+
+    @sanity_function
+    def validate(self):
+        return sn.assert_found(r'a b', self.stdout)

unittests/test_cli.py

@@ -1227,6 +1227,14 @@ def test_fixture_resolution(run_reframe, run_action):
     )
     assert returncode == 0
 
+def test_fixture_resolution_same_class(run_reframe, run_action):
+    returncode, stdout, stderr = run_reframe(
+        system='sys1',
+        environs=[],
+        checkpath=['unittests/resources/checks_unlisted/fixtures_same_class.py'],
+        action=run_action
+    )
+    assert returncode == 0
 
 def test_dynamic_tests(run_reframe, run_action):
     returncode, stdout, _ = run_reframe(