Merge branch 'master' into doc/whats-new-4.0

Author: vkarak

docs/regression_test_api.rst

@@ -206,9 +206,9 @@ Environments and Systems
    :members:
    :show-inheritance:
 
--------------------------------------
-Job Schedulers and Parallel Launchers
--------------------------------------
+---------------------------
+Jobs and Parallel Launchers
+---------------------------
 
 .. automodule:: reframe.core.schedulers
    :members:

reframe/core/pipeline.py

@@ -1194,7 +1194,7 @@ def hashcode(self):
             return self._rfm_hashcode
 
         m = hashlib.sha256()
-        if self.is_fixture:
+        if self.is_fixture():
             m.update(self.unique_name.encode('utf-8'))
         else:
             basename, *params = self.display_name.split(' %')

reframe/core/schedulers/__init__.py

@@ -22,7 +22,10 @@
 
 
 class JobMeta(RegressionTestMeta, abc.ABCMeta):
-    '''Job metaclass.'''
+    '''Job metaclass.
+
+    :meta private:
+    '''
 
 
 class JobSchedulerMeta(abc.ABCMeta):
@@ -354,34 +357,45 @@ def create(cls, scheduler, launcher, *args, **kwargs):
 
     @property
     def name(self):
+        '''The name of this job.'''
         return self._name
 
     @property
     def workdir(self):
+        '''The working directory for this job.'''
         return self._workdir
 
     @property
     def cli_options(self):
+        '''The scheduler options passed through the :option:`-J` command line
+        options.'''
         return self._cli_options
 
     @property
     def script_filename(self):
+        '''The filename of the generated job script.'''
         return self._script_filename
 
     @property
     def stdout(self):
+        '''The file where the standard output of the job is saved.'''
         return self._stdout
 
     @property
     def stderr(self):
+        '''The file where the standard error of the job is saved.'''
         return self._stderr
 
     @property
     def sched_flex_alloc_nodes(self):
+        '''The argument of the :option:`--flex-alloc-nodes` command line
+        option.'''
         return self._sched_flex_alloc_nodes
 
     @property
     def sched_access(self):
+        '''The partition's :attr:`~config.systems.partitions.access`
+        options.'''
         return self._sched_access
 
     @property
@@ -408,10 +422,16 @@ def completion_time(self):
 
     @property
     def scheduler(self):
+        '''The scheduler where this job is assigned to.'''
         return self._scheduler
 
     @property
     def exception(self):
+        '''The last exception that this job encountered.
+
+        The scheduler will raise this exception the next time the status of
+        this job is queried.
+        '''
         return self._exception
 
     @property

reframe/frontend/executors/__init__.py

@@ -386,8 +386,9 @@ def finalize(self):
 
         self._current_stage = 'finalize'
         self._notify_listeners('on_task_success')
-        self._perflogger.log_performance(logging.INFO, self,
-                                         multiline=self._perflog_compat)
+        if self.check.is_performance_check():
+            self._perflogger.log_performance(logging.INFO, self,
+                                             multiline=self._perflog_compat)
 
     @logging.time_function
     def cleanup(self, *args, **kwargs):
@@ -397,8 +398,9 @@ def fail(self, exc_info=None):
         self._failed_stage = self._current_stage
         self._exc_info = exc_info or sys.exc_info()
         self._notify_listeners('on_task_failure')
-        self._perflogger.log_performance(logging.INFO, self,
-                                         multiline=self._perflog_compat)
+        if self.check.is_performance_check():
+            self._perflogger.log_performance(logging.INFO, self,
+                                             multiline=self._perflog_compat)
 
     def skip(self, exc_info=None):
         self._skipped = True

unittests/test_filters.py

@@ -83,7 +83,9 @@ def test_have_any_name_param_test(sample_param_cases):
                              sample_param_cases)
     assert 0 == count_checks(filters.have_any_name(['_X@12']),
                              sample_param_cases)
-    assert 2 == count_checks(filters.have_any_name(['/023313dc', '/efddbc6c']),
+
+    # The /0951c7ff selects two tests as they both have x=1
+    assert 3 == count_checks(filters.have_any_name(['/0951c7ff', '/37e9e1c6']),
                              sample_param_cases)
     assert 2 == count_checks(filters.have_any_name(['_X@0', '_X@1']),
                              sample_param_cases)

unittests/test_pipeline.py

@@ -1902,6 +1902,33 @@ def set_defaults(self):
     assert x.bar == 100
 
 
+def test_hashcode():
+    # We always redefine _X0 here so that the test gets always the same base
+    # name (class name) and only the parameter values should change. We then
+    # use aliases to access the various definitions for our assertions.
+
+    class _X0(rfm.RunOnlyRegressionTest):
+        p = parameter([1])
+
+    class _X0(rfm.RunOnlyRegressionTest):
+        p = parameter([2])
+
+    _X1 = _X0
+
+    class _X0(rfm.RunOnlyRegressionTest):
+        p = parameter([1, 2])
+
+    _X2 = _X0
+
+    t0 = _X0(variant_num=0)
+    t1 = _X1(variant_num=0)
+    t2, t3 = (_X2(variant_num=i) for i in range(_X2.num_variants))
+
+    assert t0.hashcode != t1.hashcode
+    assert t2.hashcode == t0.hashcode
+    assert t3.hashcode == t1.hashcode
+
+
 def test_variables_deprecation():
     with pytest.warns(ReframeDeprecationWarning):
         class _X(rfm.RunOnlyRegressionTest):

unittests/test_policies.py

@@ -989,6 +989,20 @@ def perf1(self):
     return _MyTest()
 
 
+@pytest.fixture
+def simple_test():
+    class _MySimpleTest(rfm.RunOnlyRegressionTest):
+        valid_systems = ['*']
+        valid_prog_environs = ['*']
+        executable = 'echo hello'
+
+        @sanity_function
+        def validate(self):
+            return sn.assert_found(r'hello', self.stdout)
+
+    return _MySimpleTest()
+
+
 @pytest.fixture
 def config_perflog(make_config_file):
     def _config_perflog(fmt, perffmt=None, logging_opts=None):
@@ -1178,7 +1192,7 @@ def test_perf_logging_no_perfvars(make_runner, make_exec_ctx, perf_test,
 
 
 def test_perf_logging_multiline(make_runner, make_exec_ctx, perf_test,
-                                config_perflog, tmp_path):
+                                simple_test, config_perflog, tmp_path):
     make_exec_ctx(
         config_perflog(
             fmt=(
@@ -1193,7 +1207,7 @@ def test_perf_logging_multiline(make_runner, make_exec_ctx, perf_test,
     )
     logging.configure_logging(rt.runtime().site_config)
     runner = make_runner()
-    testcases = executors.generate_testcases([perf_test])
+    testcases = executors.generate_testcases([perf_test, simple_test])
     runner.runall(testcases)
 
     logfile = tmp_path / 'perflogs' / 'generic' / 'default' / '_MyTest.log'