Skip to content

Commit b4574f7

Browse files
author
Theofilos Manitaras
authored
Merge branch 'master' into bugfix/use-home-autodetect
2 parents e137a71 + 2ffa75c commit b4574f7

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

unittests/resources/checks_unlisted/deps_complex.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def __init__(self):
4545
self.keep_files = ['out.txt']
4646

4747
@property
48-
@sn.sanity_function
48+
@deferrable
4949
def count(self):
5050
return self._count
5151

unittests/test_deferrable.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import pytest
77
import reframe.utility.sanity as sn
8+
from reframe.core.warnings import ReframeDeprecationWarning
89

910

1011
def test_defer():
@@ -21,6 +22,13 @@ def test_evaluate():
2122
assert 3 == sn.evaluate(3)
2223

2324

25+
def test_depr_warn():
26+
with pytest.warns(ReframeDeprecationWarning):
27+
@sn.sanity_function
28+
def foo():
29+
pass
30+
31+
2432
def test_implicit_eval():
2533
# Call to bool() on a deferred expression triggers its immediate
2634
# evaluation.
@@ -40,7 +48,7 @@ def test_iter():
4048
assert i == e
4149

4250

43-
@sn.sanity_function
51+
@sn.deferrable
4452
def _add(a, b):
4553
return a + b
4654

@@ -57,7 +65,7 @@ def __init__(self):
5765
self._value = 0
5866

5967
@property
60-
@sn.sanity_function
68+
@sn.deferrable
6169
def value(self):
6270
return self._value
6371

unittests/test_logging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def fake_check():
3030
class _FakeCheck(rfm.RegressionTest):
3131
pass
3232

33-
@sn.sanity_function
33+
@sn.deferrable
3434
def error():
3535
raise BaseException
3636

unittests/test_pipeline.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def test_hellocheck_build_remotely(hellotest, remote_exec_ctx):
202202

203203

204204
def test_hellocheck_local_prepost_run(hellotest, local_exec_ctx):
205-
@sn.sanity_function
205+
@sn.deferrable
206206
def stagedir(test):
207207
return test.stagedir
208208

@@ -1203,7 +1203,7 @@ def test_performance_var_evaluation(dummytest, sanity_file,
12031203
# `check_performance()`.
12041204
logfile = 'perf.log'
12051205

1206-
@sn.sanity_function
1206+
@sn.deferrable
12071207
def extract_perf(patt, tag):
12081208
val = sn.evaluate(
12091209
sn.extractsingle(patt, perf_file, tag, float)

unittests/test_sanity_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def __init__(self):
2424
self._b = 1
2525

2626
@property
27-
@sn.sanity_function
27+
@sn.deferrable
2828
def a(self):
2929
return self._a
3030

0 commit comments

Comments
 (0)