Merge branch 'master' into bugfix/sigterm_unittest

Author: Vasileios Karakasis

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'}

reframe/core/pipeline.py

@@ -670,7 +670,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

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.'''

unittests/test_utility.py

@@ -173,6 +173,17 @@ def test_samefile(self):
                                os.path.join(prefix, 'broken1'))
         shutil.rmtree(prefix)
 
+    # FIXME: This should be changed in order to use the `monkeypatch`
+    # fixture of `pytest` instead of creating an instance of `MonkeyPatch`
+    def test_is_interactive(self):
+        from _pytest.monkeypatch import MonkeyPatch  # noqa: F401, F403
+
+        monkey = MonkeyPatch()
+        with monkey.context() as c:
+            # Set `sys.ps1` to immitate an interactive session
+            c.setattr(sys, 'ps1', 'rfm>>> ', raising=False)
+            assert os_ext.is_interactive()
+
     def test_is_url(self):
         repo_https = 'https://github.com/eth-cscs/reframe.git'
         repo_ssh = '[email protected]:eth-cscs/reframe.git'