Merge branch 'master' into feat/queuing-timeout

Author: Vasileios Karakasis

.travis.yml

@@ -1,7 +1,6 @@
 dist: xenial
 language: python
 python:
-    - "3.5"
     - "3.6"
     - "3.7"
     - "3.8"

cscs-checks/apps/namd/namd_check.py

@@ -72,12 +72,12 @@ def __init__(self, scale, variant):
         if scale == 'small':
             self.valid_systems += ['dom:gpu']
             self.reference = {
-                'dom:gpu': {'days_ns': (0.18, None, 0.05, 'days/ns')},
-                'daint:gpu': {'days_ns': (0.18, None, 0.05, 'days/ns')}
+                'dom:gpu': {'days_ns': (0.15, None, 0.05, 'days/ns')},
+                'daint:gpu': {'days_ns': (0.15, None, 0.05, 'days/ns')}
             }
         else:
             self.reference = {
-                'daint:gpu': {'days_ns': (0.11, None, 0.05, 'days/ns')}
+                'daint:gpu': {'days_ns': (0.07, None, 0.05, 'days/ns')}
             }
 
 
@@ -94,12 +94,12 @@ def __init__(self, scale, variant):
         if scale == 'small':
             self.valid_systems += ['dom:mc']
             self.reference = {
-                'dom:mc': {'days_ns': (0.57, None, 0.05, 'days/ns')},
-                'daint:mc': {'days_ns': (0.56, None, 0.05, 'days/ns')}
+                'dom:mc': {'days_ns': (0.51, None, 0.05, 'days/ns')},
+                'daint:mc': {'days_ns': (0.51, None, 0.05, 'days/ns')}
             }
         else:
             self.reference = {
-                'daint:mc': {'days_ns': (0.38, None, 0.05, 'days/ns')}
+                'daint:mc': {'days_ns': (0.28, None, 0.05, 'days/ns')}
             }
 
         self.tags |= {'maintenance' if variant == 'maint' else 'production'}

docs/started.rst

@@ -5,12 +5,16 @@ Getting Started
 Requirements
 ------------
 
-* Python 3.5 or higher. Python 2 is not supported.
+* Python 3.6 or higher. Python 2 is not supported.
 
   .. note::
     .. versionchanged:: 2.8
       A functional TCL modules system is no more required. ReFrame can now operate without a modules system at all.
 
+  .. note::
+    .. versionchanged:: 3.0
+      Support for Python 3.5 has been dropped.
+
 Optional
 ~~~~~~~~
 

reframe/__init__.py

@@ -9,7 +9,7 @@
 
 VERSION = '3.0-dev2'
 INSTALL_PREFIX = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-MIN_PYTHON_VERSION = (3, 5, 0)
+MIN_PYTHON_VERSION = (3, 6, 0)
 
 # Check python version
 if sys.version_info[:3] < MIN_PYTHON_VERSION:

reframe/core/pipeline.py

@@ -682,7 +682,10 @@ def __new__(cls, *args, **kwargs):
         try:
             prefix = cls._rfm_custom_prefix
         except AttributeError:
-            prefix = os.path.abspath(os.path.dirname(inspect.getfile(cls)))
+            if os_ext.is_interactive():
+                prefix = os.getcwd()
+            else:
+                prefix = os.path.abspath(os.path.dirname(inspect.getfile(cls)))
 
         obj._rfm_init(name, prefix)
         return obj
@@ -1517,6 +1520,7 @@ def compile_wait(self):
         This is a no-op for this type of test.
         '''
 
+    @_run_hooks('pre_run')
     def run(self):
         '''The run phase of the regression test pipeline.
 
@@ -1530,7 +1534,7 @@ def run(self):
                 self._copy_to_stagedir(os.path.join(self._prefix,
                                                     self.sourcesdir))
 
-        super().run()
+        super().run.__wrapped__(self)
 
 
 class CompileOnlyRegressionTest(RegressionTest):
@@ -1550,6 +1554,7 @@ def _rfm_init(self, *args, **kwargs):
         super()._rfm_init(*args, **kwargs)
         self.local = True
 
+    @_run_hooks()
     def setup(self, partition, environ, **job_opts):
         '''The setup stage of the regression test pipeline.
 

reframe/utility/os_ext.py

@@ -227,6 +227,11 @@ def inpath(entry, pathvar):
     return entry in set(pathvar.split(':'))
 
 
+def is_interactive():
+    '''Returns whether the given Python session is interactive'''
+    return hasattr(sys, 'ps1') or sys.flags.interactive
+
+
 def subdirs(dirname, recurse=False):
     '''Returns a list of dirname + its subdirectories. If recurse is True,
     recursion is performed in pre-order.'''

requirements.txt

@@ -1,4 +1,4 @@
 jsonschema
-pytest>=3.5.0
+pytest>=5.0.0
 coverage
 setuptools

setup.py

@@ -25,7 +25,6 @@
     scripts=['bin/reframe'],
     classifiers=(
         'Development Status :: 5 - Production/Stable',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',

unittests/resources/checks_unlisted/selfkill.py

@@ -0,0 +1,31 @@
+# Copyright 2016-2020 Swiss National Supercomputing Centre (CSCS/ETH Zurich)
+# ReFrame Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#
+# Check for testing handling of the TERM signal
+#
+import os
+import signal
+import time
+
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+
+@rfm.simple_test
+class SelfKillCheck(rfm.RunOnlyRegressionTest):
+    def __init__(self):
+        self.local = True
+        self.valid_systems = ['*']
+        self.valid_prog_environs = ['*']
+        self.executable = 'echo hello'
+        self.sanity_patterns = sn.assert_found('hello', self.stdout)
+        self.tags = {type(self).__name__}
+        self.maintainers = ['TM']
+
+    def run(self):
+        super().run()
+        time.sleep(0.5)
+        os.kill(os.getpid(), signal.SIGTERM)

unittests/test_pipeline.py

@@ -457,6 +457,30 @@ def postfoo(self):
         assert '_RFM_PRE_SETUP' in os.environ
         assert '_RFM_POST_SETUP' in os.environ
 
+    def test_setup_hooks_in_compile_only_test(self):
+        @fixtures.custom_prefix('unittests/resources/checks')
+        class MyTest(rfm.CompileOnlyRegressionTest):
+            def __init__(self):
+                self.name = 'hellocheck_compile'
+                self.valid_systems = ['*']
+                self.valid_prog_environs = ['*']
+                self.sourcepath = 'hello.c'
+                self.executable = os.path.join('.', self.name)
+                self.sanity_patterns = sn.assert_found('.*', self.stdout)
+                self.count = 0
+
+            @rfm.run_before('setup')
+            def presetup(self):
+                self.count += 1
+
+            @rfm.run_after('setup')
+            def postsetup(self):
+                self.count += 1
+
+        test = MyTest()
+        _run(test, self.partition, self.prgenv)
+        assert test.count == 2
+
     def test_compile_hooks(self):
         @fixtures.custom_prefix('unittests/resources/checks')
         class MyTest(HelloTest):
@@ -498,6 +522,26 @@ def check_executable(self):
         test = MyTest()
         _run(test, self.partition, self.prgenv)
 
+    def test_run_hooks_in_run_only_test(self):
+        @fixtures.custom_prefix('unittests/resources/checks')
+        class MyTest(rfm.RunOnlyRegressionTest):
+            def __init__(self):
+                self.executable = 'echo'
+                self.executable_opts = ['Hello, World!']
+                self.local = True
+                self.valid_prog_environs = ['*']
+                self.valid_systems = ['*']
+                self.sanity_patterns = sn.assert_found(
+                    r'Hello, World\!', self.stdout)
+
+            @rfm.run_before('run')
+            def check_empty_stage(self):
+                # Make sure nothing has been copied to the stage directory yet
+                assert len(os.listdir(self.stagedir)) == 0
+
+        test = MyTest()
+        _run(test, self.partition, self.prgenv)
+
     def test_multiple_hooks(self):
         @fixtures.custom_prefix('unittests/resources/checks')
         class MyTest(HelloTest):