Skip to content

Commit 80bf74f

Browse files
author
Vasileios Karakasis
committed
Merge branch 'master' into feat/skip-tests
2 parents 4b0da87 + 4d21a13 commit 80bf74f

File tree

7 files changed

+13
-2
lines changed

7 files changed

+13
-2
lines changed

reframe/core/pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ def pipeline_hooks(cls):
603603
#:
604604
#: ::
605605
#:
606-
#: self.sanity_patterns = sn.assert_found(r'.*', self.stdout)
606+
#: self.sanity_patterns = sn.assert_true(1)
607607
sanity_patterns = variable(_DeferredExpression, type(None), value=None)
608608

609609
#: Patterns for verifying the performance of this test.

reframe/frontend/loader.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ def _validate_check(self, check):
8181

8282
name = type(check).__name__
8383
checkfile = os.path.relpath(inspect.getfile(type(check)))
84-
required_attrs = ['valid_systems', 'valid_prog_environs']
84+
required_attrs = ['sanity_patterns',
85+
'valid_systems', 'valid_prog_environs']
8586
for attr in required_attrs:
8687
if getattr(check, attr) is None:
8788
getlogger().warning(

unittests/resources/checks/bad/invalid_check.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
# SPDX-License-Identifier: BSD-3-Clause
55

66
import reframe as rfm
7+
import reframe.utility.sanity as sn
78

89

910
@rfm.simple_test
1011
class SomeTest(rfm.RegressionTest):
1112
def __init__(self):
1213
self.valid_systems = []
1314
self.valid_prog_environs = []
15+
self.sanity_patterns = sn.assert_true(1)
1416

1517

1618
class NotATest:

unittests/resources/checks/emptycheck.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
# SPDX-License-Identifier: BSD-3-Clause
55

66
import reframe as rfm
7+
import reframe.utility.sanity as sn
78

89

910
@rfm.simple_test
1011
class EmptyTest(rfm.RegressionTest):
1112
def __init__(self):
1213
self.valid_systems = []
1314
self.valid_prog_environs = []
15+
self.sanity_patterns = sn.assert_true(1)

unittests/resources/checks/frontend_checks.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ class TestWithGenerator(rfm.RunOnlyRegressionTest):
243243
def __init__(self):
244244
self.valid_systems = ['*']
245245
self.valid_prog_environs = ['*']
246+
self.sanity_patterns = sn.assert_true(1)
246247

247248
def foo():
248249
yield True
@@ -257,6 +258,7 @@ class TestWithFileObject(rfm.RunOnlyRegressionTest):
257258
def __init__(self):
258259
self.valid_systems = ['*']
259260
self.valid_prog_environs = ['*']
261+
self.sanity_patterns = sn.assert_true(1)
260262
with open(__file__) as fp:
261263
pass
262264

unittests/resources/checks_unlisted/good.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#
99

1010
import reframe as rfm
11+
import reframe.utility.sanity as sn
1112

1213
# We just import this individually for testing purposes
1314
from reframe.core.pipeline import RegressionTest
@@ -17,6 +18,7 @@ class _Base(RegressionTest):
1718
def __init__(self):
1819
self.valid_systems = ['*']
1920
self.valid_prog_environs = ['*']
21+
self.sanity_patterns = sn.assert_true(1)
2022

2123

2224
@rfm.parameterized_test(*((x, y) for x in range(3) for y in range(2)))

unittests/resources/checks_unlisted/kbd_interrupt.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#
1212

1313
import reframe as rfm
14+
import reframe.utility.sanity as sn
1415

1516

1617
@rfm.simple_test
@@ -21,6 +22,7 @@ def __init__(self):
2122
self.valid_systems = ['*']
2223
self.valid_prog_environs = ['*']
2324
self.tags = {self.name}
25+
self.sanity_patterns = sn.assert_true(1)
2426

2527
@rfm.run_before('setup')
2628
def raise_keyboard_interrupt(self):

0 commit comments

Comments
 (0)