Skip to content

Commit 984d7b7

Browse files
author
Vasileios Karakasis
authored
Merge pull request #1199 from teojgo/checks/string_timelimit
[test] Fix deprecated `time_limit` syntax in checks
2 parents 339d088 + 07a5bc1 commit 984d7b7

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

cscs-checks/apps/cpmd/cpmd_check.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def __init__(self, scale):
2121
self.valid_systems += ['dom:gpu']
2222
else:
2323
self.num_tasks = 16
24-
self.time_limit = (0, 20, 0)
2524

2625
self.num_tasks_per_node = 1
2726
self.valid_prog_environs = ['PrgEnv-intel']

cscs-checks/apps/paraview/paraview_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def __init__(self):
1616
self.num_tasks_per_node = 12
1717
self.modules = ['ParaView']
1818

19-
self.time_limit = (0, 1, 0)
19+
self.time_limit = '1m'
2020
self.executable = 'pvbatch'
2121
self.executable_opts = ['coloredSphere.py']
2222

cscs-checks/microbenchmarks/spec-accel/spec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __init__(self, prg_envs):
4242

4343
self.num_tasks = 1
4444
self.num_tasks_per_node = 1
45-
self.time_limit = (0, 30, 0)
45+
self.time_limit = '30m'
4646

4747
self.executable = 'runspec'
4848

cscs-checks/prgenv/mpi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(self, required_thread):
4848
}
4949
self.build_system.cppflags = self.cppflags[required_thread]
5050
self.build_system.cppflags += ['-static']
51-
self.time_limit = (0, 1, 0)
51+
self.time_limit = '1m'
5252
found_mpithread = sn.extractsingle(
5353
r'^mpi_thread_required=\w+\s+mpi_thread_supported=\w+'
5454
r'\s+mpi_thread_queried=\w+\s+(?P<result>\d)$',

cscs-checks/system/io/ior_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def __init__(self, base_dir):
101101
# Default umask is 0022, which generates file permissions -rw-r--r--
102102
# we want -rw-rw-r-- so we set umask to 0002
103103
os.umask(2)
104-
self.time_limit = (0, 5, 0)
104+
self.time_limit = '5m'
105105
# Our references are based on fs types but regression needs reference
106106
# per system.
107107
self.reference = {

cscs-checks/system/openstack/s3_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def __init__(self):
1515
self.tags = {'ops', 'object_store'}
1616
self.valid_systems = ['dom:gpu', 'daint:gpu']
1717
self.valid_prog_environs = ['PrgEnv-gnu']
18-
self.time_limit = (0, 5, 0)
18+
self.time_limit = '5m'
1919
self.maintainers = ['VH', 'GLR']
2020
self.executable = 's3_test.sh'
2121
self.username = getpass.getuser()

cscs-checks/system/slurm/slurm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def set_slurm_constraint(self):
170170
class MemoryOverconsumptionCheck(SlurmCompiledBaseCheck):
171171
def __init__(self):
172172
super().__init__()
173-
self.time_limit = (0, 1, 0)
173+
self.time_limit = '1m'
174174
self.sourcepath = 'eatmemory.c'
175175
self.tags.add('mem')
176176
self.executable_opts = ['4000M']

cscs-checks/tools/jupyter/jupyter_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def __init__(self):
1515
self.valid_prog_environs = ['*']
1616
self.sourcesdir = None
1717
self.executable = 'hostname'
18-
self.time_limit = (0, 1, 0)
18+
self.time_limit = '1m'
1919
self.sanity_patterns = sn.assert_found(r'nid\d+', self.stdout)
2020
self.tags = {'production', 'maintenance'}
2121
self.maintainers = ['RS', 'TR']

0 commit comments

Comments
 (0)