Skip to content

only check sanity_check_components and sanity_check_all_components when Bundle easyblock is used in test_pr_sanity_check_paths #14769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akesandgren merged 1 commit into from
Jan 19, 2022
Merged

only check sanity_check_components and sanity_check_all_components when Bundle easyblock is used in test_pr_sanity_check_paths #14769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions test/easyconfigs/easyconfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,18 +1024,20 @@ def test_pr_sanity_check_paths(self):
failing_checks = []

for ec in self.changed_ecs:

easyblock = ec.get('easyblock')
if is_generic_easyblock(easyblock) and not ec.get('sanity_check_paths'):

bundle_sanity_check_components = ec['sanity_check_components'] or ec['sanity_check_all_components']
sanity_check_ok = False

if is_generic_easyblock(easyblock) and not ec.get('sanity_check_paths'):
if easyblock in whitelist or (easyblock == 'Bundle' and ec['name'] in bundles_whitelist):
pass
sanity_check_ok = True

# also allow bundles that enable per-component sanity checks
elif easyblock == 'Bundle' and bundle_sanity_check_components:
pass
else:
elif easyblock == 'Bundle':
if ec['sanity_check_components'] or ec['sanity_check_all_components']:
sanity_check_ok = True

if not sanity_check_ok:
ec_fn = os.path.basename(ec.path)
failing_checks.append("No custom sanity_check_paths found in %s" % ec_fn)

Expand Down