Merge branch 'master' into bugfix/interactive_crash

Theofilos Manitaras · web-flow · commit 0c0d7c56ffd8 · 2020-03-05T14:38:26.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -120,44 +120,6 @@ stage('Unittest') {
     }
 }
 
-stage('Public Test') {
-    if (currentBuild.result != 'SUCCESS') {
-        println 'Not executing "Public Test" Stage'
-        return
-    }
-    else {
-        try {
-            if (!('dom' in machinesToRun)) {
-                return
-            }
-            node('dom') {
-                def scratch = sh(returnStdout: true,
-                             script: """${loginBash}
-                                        echo \$SCRATCH""").trim()
-                def reframeDir = "${scratch}/${dirPrefix}-dom-${uniqueID}"
-                dir(reframeDir) {
-                    sh("""${loginBash}
-                          bash ${reframeDir}/$bashScript -f ${reframeDir} -i '' -g""")
-                }
-            }
-            currentBuild.result = "SUCCESS"
-        } catch(err) {
-            if (err.toString().contains('exit code 143')) {
-                currentBuild.result = "ABORTED"
-                println "The Public Test was cancelled. Aborting....."
-            }
-            else if (err.toString().contains('Queue task was cancelled')) {
-                currentBuild.result = "ABORTED"
-                println "The Queue task was cancelled. Aborting....."
-            }
-            else {
-                currentBuild.result = "FAILURE"
-                println "The Public Test failed. Exiting....."
-            }
-        }
-    }
-}
-
 builds = [:]
 stage('Tutorial Check') {
     if (currentBuild.result != 'SUCCESS') {
diff --git a/cscs-checks/apps/cpmd/cpmd_check.py b/cscs-checks/apps/cpmd/cpmd_check.py
@@ -21,7 +21,6 @@ def __init__(self, scale):
             self.valid_systems += ['dom:gpu']
         else:
             self.num_tasks = 16
-            self.time_limit = (0, 20, 0)
 
         self.num_tasks_per_node = 1
         self.valid_prog_environs = ['PrgEnv-intel']
diff --git a/cscs-checks/apps/paraview/paraview_check.py b/cscs-checks/apps/paraview/paraview_check.py
@@ -16,7 +16,7 @@ def __init__(self):
         self.num_tasks_per_node = 12
         self.modules = ['ParaView']
 
-        self.time_limit = (0, 1, 0)
+        self.time_limit = '1m'
         self.executable = 'pvbatch'
         self.executable_opts = ['coloredSphere.py']
 
diff --git a/cscs-checks/microbenchmarks/spec-accel/spec.py b/cscs-checks/microbenchmarks/spec-accel/spec.py
@@ -42,7 +42,7 @@ def __init__(self, prg_envs):
 
         self.num_tasks = 1
         self.num_tasks_per_node = 1
-        self.time_limit = (0, 30, 0)
+        self.time_limit = '30m'
 
         self.executable = 'runspec'
 
diff --git a/cscs-checks/prgenv/mpi.py b/cscs-checks/prgenv/mpi.py
@@ -48,7 +48,7 @@ def __init__(self, required_thread):
         }
         self.build_system.cppflags = self.cppflags[required_thread]
         self.build_system.cppflags += ['-static']
-        self.time_limit = (0, 1, 0)
+        self.time_limit = '1m'
         found_mpithread = sn.extractsingle(
             r'^mpi_thread_required=\w+\s+mpi_thread_supported=\w+'
             r'\s+mpi_thread_queried=\w+\s+(?P<result>\d)$',
diff --git a/cscs-checks/system/io/ior_check.py b/cscs-checks/system/io/ior_check.py
@@ -101,7 +101,7 @@ def __init__(self, base_dir):
         # Default umask is 0022, which generates file permissions -rw-r--r--
         # we want -rw-rw-r-- so we set umask to 0002
         os.umask(2)
-        self.time_limit = (0, 5, 0)
+        self.time_limit = '5m'
         # Our references are based on fs types but regression needs reference
         # per system.
         self.reference = {
diff --git a/cscs-checks/system/openstack/s3_check.py b/cscs-checks/system/openstack/s3_check.py
@@ -15,7 +15,7 @@ def __init__(self):
         self.tags = {'ops', 'object_store'}
         self.valid_systems = ['dom:gpu', 'daint:gpu']
         self.valid_prog_environs = ['PrgEnv-gnu']
-        self.time_limit = (0, 5, 0)
+        self.time_limit = '5m'
         self.maintainers = ['VH', 'GLR']
         self.executable = 's3_test.sh'
         self.username = getpass.getuser()
diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py
@@ -170,7 +170,7 @@ def set_slurm_constraint(self):
 class MemoryOverconsumptionCheck(SlurmCompiledBaseCheck):
     def __init__(self):
         super().__init__()
-        self.time_limit = (0, 1, 0)
+        self.time_limit = '1m'
         self.sourcepath = 'eatmemory.c'
         self.tags.add('mem')
         self.executable_opts = ['4000M']
diff --git a/cscs-checks/tools/jupyter/jupyter_tests.py b/cscs-checks/tools/jupyter/jupyter_tests.py
@@ -15,7 +15,7 @@ def __init__(self):
         self.valid_prog_environs = ['*']
         self.sourcesdir = None
         self.executable = 'hostname'
-        self.time_limit = (0, 1, 0)
+        self.time_limit = '1m'
         self.sanity_patterns = sn.assert_found(r'nid\d+', self.stdout)
         self.tags = {'production', 'maintenance'}
         self.maintainers = ['RS', 'TR']
diff --git a/reframe/frontend/cli.py b/reframe/frontend/cli.py
@@ -9,6 +9,7 @@
 import socket
 import sys
 import traceback
+import warnings
 
 import reframe
 import reframe.core.config as config
@@ -20,8 +21,8 @@
 import reframe.frontend.dependency as dependency
 import reframe.utility.os_ext as os_ext
 from reframe.core.exceptions import (
-    ConfigError, EnvironError, ReframeError, ReframeFatalError,
-    ReframeForceExitError, SystemAutodetectionError
+    ConfigError, EnvironError, ReframeDeprecationWarning, ReframeError,
+    ReframeFatalError, ReframeForceExitError, SystemAutodetectionError
 )
 from reframe.core.exceptions import format_exception
 from reframe.frontend.executors import Runner, generate_testcases
@@ -232,6 +233,9 @@ def main():
         help='Disable coloring of output')
     misc_options.add_argument('--performance-report', action='store_true',
                               help='Print the performance report')
+    misc_options.add_argument(
+        '--no-deprecation-warnings', action='store_true',
+        help='Suppress deprecation warnings from the framework')
 
     # FIXME: This should move to env_options as soon as
     # https://github.com/eth-cscs/reframe/pull/946 is merged
@@ -440,6 +444,9 @@ def main():
 
     printer.debug(argparse.format_options(options))
 
+    if options.no_deprecation_warnings:
+        warnings.filterwarnings('ignore', category=ReframeDeprecationWarning)
+
     # Print command line
     printer.info('Command line: %s' % ' '.join(sys.argv))
     printer.info('Reframe version: '  + os_ext.reframe_version())
diff --git a/unittests/resources/checks_unlisted/deprecated_test.py b/unittests/resources/checks_unlisted/deprecated_test.py
@@ -0,0 +1,17 @@
+import reframe as rfm
+import reframe.utility.sanity as sn
+from reframe.core.exceptions import user_deprecation_warning
+
+
+@rfm.simple_test
+class DeprecatedTest(rfm.RunOnlyRegressionTest):
+    def __init__(self):
+        self.valid_systems = ['*']
+        self.valid_prog_environs = ['*']
+        self.local = True
+        self.executable = 'echo hello'
+        self.sanity_patterns = sn.assert_found('hello', self.stdout)
+
+    @rfm.run_before('setup')
+    def deprecation_warning(self):
+        user_deprecation_warning('feature foo is deprecated')
diff --git a/unittests/test_cli.py b/unittests/test_cli.py
@@ -19,6 +19,7 @@
 import reframe.core.runtime as rt
 import reframe.utility.os_ext as os_ext
 import unittests.fixtures as fixtures
+from reframe.core.exceptions import ReframeDeprecationWarning
 
 
 def run_command_inline(argv, funct, *args, **kwargs):
@@ -433,6 +434,24 @@ def test_show_env_config_unknown_env(self):
         assert 'Traceback' not in stderr
         assert 1 == returncode
 
+    def test_no_deprecation_warnings(self):
+        self.action = 'run'
+        self.checkpath = [
+            'unittests/resources/checks_unlisted/deprecated_test.py'
+        ]
+        with pytest.warns(ReframeDeprecationWarning):
+            returncode, stdout, stderr = self._run_reframe()
+
+        self.more_options = ['--no-deprecation-warnings']
+
+        # We get the list of captured `warnings.WarningMessage` objects
+        with pytest.warns(None) as warnings:
+            self._run_reframe()
+
+        # The `message` field contains the actual exception object
+        assert not any(isinstance(w.message, ReframeDeprecationWarning)
+                       for w in warnings)
+
     def test_verbosity(self):
         self.more_options = ['-vvvvv']
         self.system = 'testsys'
diff --git a/unittests/test_policies.py b/unittests/test_policies.py
@@ -270,7 +270,8 @@ def _runall(checks, conn):
             except BaseException as e:
                 exc = e
 
-            conn.send((exc, len(self.runner.stats.failures())))
+            stats = self.runner.stats
+            conn.send((exc, stats.num_cases(), len(stats.failures())))
             conn.close()
 
         rd_endpoint, wr_endpoint = multiprocessing.Pipe(duplex=False)
@@ -286,8 +287,11 @@ def _runall(checks, conn):
         time.sleep(1)
         p.terminate()
         p.join()
-        exc, num_failures = rd_endpoint.recv()
-        assert 1 == num_failures
+        exc, num_cases, num_failures = rd_endpoint.recv()
+
+        # Either the test is submitted and it fails due to the termination
+        # or it is not yet submitted when the termination signal is sent
+        assert (num_cases, num_failures) in {(1, 1), (0, 0)}
         with pytest.raises(ReframeForceExitError,
                            match='received TERM signal'):
             if exc:

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def __init__(self, required_thread):`
`48`	`48`	`}`
`49`	`49`	`self.build_system.cppflags = self.cppflags[required_thread]`
`50`	`50`	`self.build_system.cppflags += ['-static']`
`51`		`- self.time_limit = (0, 1, 0)`
	`51`	`+ self.time_limit = '1m'`
`52`	`52`	`found_mpithread = sn.extractsingle(`
`53`	`53`	`r'^mpi_thread_required=\w+\s+mpi_thread_supported=\w+'`
`54`	`54`	`r'\s+mpi_thread_queried=\w+\s+(?P<result>\d)$',`