From a38870a34b8081ef83207414e16bf3b9665db36c Mon Sep 17 00:00:00 2001
From: Samuel Moors <samuel.moors@vub.be>
Date: Thu, 12 Dec 2024 11:48:47 +0100
Subject: [PATCH] fix setting ci with bench_name check

---
 eessi/testsuite/eessi_mixin.py                | 3 +--
 eessi/testsuite/tests/apps/QuantumESPRESSO.py | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/eessi/testsuite/eessi_mixin.py b/eessi/testsuite/eessi_mixin.py
index a794fe6c..d03d65e2 100644
--- a/eessi/testsuite/eessi_mixin.py
+++ b/eessi/testsuite/eessi_mixin.py
@@ -41,6 +41,7 @@ class EESSI_Mixin(RegressionMixin):
     # Set defaults for these class variables, can be overwritten by child class if desired
     measure_memory_usage = variable(bool, value=False)
     scale = parameter(SCALES.keys())
+    bench_name = None
     bench_name_ci = None
 
     # Create ReFrame variables for logging runtime environment information
@@ -63,8 +64,6 @@ def __init_subclass__(cls, **kwargs):
         cls.valid_systems = ['*']
         if not cls.time_limit:
             cls.time_limit = '1h'
-        if 'bench_name' not in dir():
-            cls.bench_name = None
 
     # Helper function to validate if an attribute is present it item_dict.
     # If not, print it's current name, value, and the valid_values
diff --git a/eessi/testsuite/tests/apps/QuantumESPRESSO.py b/eessi/testsuite/tests/apps/QuantumESPRESSO.py
index 1990e0be..1f1f6270 100644
--- a/eessi/testsuite/tests/apps/QuantumESPRESSO.py
+++ b/eessi/testsuite/tests/apps/QuantumESPRESSO.py
@@ -43,8 +43,6 @@ class EESSI_QuantumESPRESSO_PW(QEspressoPWCheck, EESSI_Mixin):
     module_name = parameter(find_modules('QuantumESPRESSO'))
     # For now, QE is built for CPU targets only
     device_type = parameter([DEVICE_TYPES[CPU]])
-    bench_name_ci = 'bench_ci'
-    bench_name = None
 
     def required_mem_per_node(self):
         return (self.num_tasks_per_node * 0.9 + 4) * 1024
@@ -55,7 +53,7 @@ def set_ci(self):
         min_ecut = min(QEspressoPWCheck.ecut.values)
         min_nbnd = min(QEspressoPWCheck.nbnd.values)
         if self.ecut == min_ecut and self.nbnd == min_nbnd:
-            self.bench_name = self.bench_name_ci
+            self.bench_name = self.bench_name_ci = 'bench_ci'
 
     @run_after('init')
     def set_increased_walltime(self):