Skip to content

Commit e9f201a

Browse files
committed
Add exceptions for test pass
1 parent 51f6d6f commit e9f201a

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

easybuild/framework/easyblock.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ def collect_exts_file_info(self, fetch_files=True, verify_checksums=True):
545545
"""
546546
exts_sources = []
547547
exts_list = self.cfg.get_ref('exts_list')
548-
549548
if verify_checksums and not fetch_files:
550549
raise EasyBuildError("Can't verify checksums for extension files if they are not being fetched")
551550

@@ -1894,7 +1893,6 @@ def install_extensions_sequential(self, install=True):
18941893
exts_cnt = len(self.ext_instances)
18951894

18961895
for idx, ext in enumerate(self.ext_instances):
1897-
18981896
self.log.info("Starting extension %s", ext.name)
18991897

19001898
run_hook(SINGLE_EXTENSION, self.hooks, pre_step_hook=True, args=[ext])
@@ -2791,7 +2789,6 @@ def init_ext_instances(self):
27912789
exts_cnt = len(self.exts)
27922790

27932791
self.update_exts_progress_bar("creating internal datastructures for extensions")
2794-
27952792
for idx, ext in enumerate(self.exts):
27962793
ext_name = ext['name']
27972794
self.log.debug("Creating class instance for extension %s...", ext_name)
@@ -3691,6 +3688,10 @@ def xs2str(xs):
36913688

36923689
# pass or fail
36933690
if self.sanity_check_fail_msgs:
3691+
try:
3692+
self.exit_code
3693+
except AttributeError:
3694+
self.exit_code = 1
36943695
raise EasyBuildError(
36953696
"Sanity check failed: " + '\n'.join(self.sanity_check_fail_msgs), exit_code=self.exit_code)
36963697
else:
@@ -4320,7 +4321,10 @@ def build_and_install_one(ecdict, init_env):
43204321

43214322
except EasyBuildError as err:
43224323
error_msg = err.msg
4323-
exit_code = err.exit_code
4324+
try:
4325+
exit_code
4326+
except NameError:
4327+
exit_code = 1
43244328
result = False
43254329

43264330
ended = 'ended'

easybuild/framework/easyconfig/easyconfig.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,6 +2049,10 @@ def process_easyconfig(path, build_specs=None, validate=True, parse_only=False,
20492049
try:
20502050
ec = EasyConfig(spec, build_specs=build_specs, validate=validate, hidden=hidden)
20512051
except EasyBuildError as err:
2052+
try:
2053+
err.exit_code
2054+
except AttributeError:
2055+
err.exit_code = 1
20522056
raise EasyBuildError("Failed to process easyconfig %s: %s", spec, err.msg, exit_code=err.exit_code)
20532057

20542058
name = ec['name']

easybuild/tools/build_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def __init__(self, msg, *args, **kwargs):
8383
self.msg = msg
8484
if kwargs:
8585
self.__dict__.update(kwargs)
86-
print("defined at EBerror:", self.__dict__.keys())
86+
8787
def __str__(self):
8888
"""Return string representation of this EasyBuildError instance."""
8989
return repr(self.msg)

0 commit comments

Comments
 (0)