Skip to content

Commit 3cc608b

Browse files
author
ocaisa
authored
Merge pull request #3782 from Flamefire/test-failure-fix
Fix ignore_test_failure not set for Extensions
2 parents e74d2e2 + 2364097 commit 3cc608b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

easybuild/framework/easyblock.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ def __init__(self, ec):
258258
if group_name is not None:
259259
self.group = use_group(group_name)
260260

261-
self.ignore_test_failure = build_option('ignore_test_failure')
262-
263261
# generate build/install directories
264262
self.gen_builddir()
265263
self.gen_installdir()
@@ -1831,7 +1829,7 @@ def report_test_failure(self, msg_or_error):
18311829
18321830
:param msg_or_error: failure description (string value or an EasyBuildError instance)
18331831
"""
1834-
if self.ignore_test_failure:
1832+
if build_option('ignore_test_failure'):
18351833
print_warning("Test failure ignored: " + str(msg_or_error), log=self.log)
18361834
else:
18371835
exception = msg_or_error if isinstance(msg_or_error, EasyBuildError) else EasyBuildError(msg_or_error)

test/framework/easyblock.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ def check_extra_options_format(extra_options):
127127
extra_options = exeb1.extra_options()
128128
check_extra_options_format(extra_options)
129129
self.assertTrue('options' in extra_options)
130+
# Reporting test failure should work also for the extension EB
131+
self.assertRaises(EasyBuildError, exeb1.report_test_failure, "Fails")
130132

131133
# test extensioneasyblock, as easyblock
132134
exeb2 = ExtensionEasyBlock(ec)
@@ -135,6 +137,8 @@ def check_extra_options_format(extra_options):
135137
extra_options = exeb2.extra_options()
136138
check_extra_options_format(extra_options)
137139
self.assertTrue('options' in extra_options)
140+
# Reporting test failure should work also for the extension EB
141+
self.assertRaises(EasyBuildError, exeb2.report_test_failure, "Fails")
138142

139143
class TestExtension(ExtensionEasyBlock):
140144
@staticmethod

0 commit comments

Comments
 (0)