Skip to content
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

update info being printed when fetch step is running to make it clear that checksums are verified as well #4729

Merged
merged 1 commit into from
Dec 30, 2024
Merged

update info being printed when fetch step is running to make it clear that checksums are verified as well #4729

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion easybuild/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4223,7 +4223,8 @@ def install_step_spec(initial):

# part 1: pre-iteration + first iteration
steps_part1 = [
(FETCH_STEP, 'fetching files', [lambda x: x.fetch_step, lambda x: x.checksum_step], False),
(FETCH_STEP, "fetching files and verifying checksums",
[lambda x: x.fetch_step, lambda x: x.checksum_step], False),
ready_step_spec(True),
extract_step_spec,
patch_step_spec,
Expand Down
5 changes: 3 additions & 2 deletions test/framework/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5524,6 +5524,7 @@ def test_stop(self):
self.assertIn("option --stop: invalid choice: 'source' (choose from", stderr)

def test_fetch(self):
"""Test use of --fetch"""
options = EasyBuildOptions(go_args=['--fetch'])

self.assertTrue(options.options.fetch)
Expand All @@ -5547,7 +5548,7 @@ def test_fetch(self):
stdout, _ = self._run_mock_eb(args, raise_error=True, strip=True, testing=False)

patterns = [
r"^== fetching files\.\.\.$",
r"^== fetching files and verifying checksums\.\.\.$",
r"^== COMPLETED: Installation STOPPED successfully \(took .* secs?\)$",
]
for pattern in patterns:
Expand Down Expand Up @@ -6682,7 +6683,7 @@ def test_sanity_check_only(self):
stdout = self.mocked_main(args + ['--trace'], do_build=True, raise_error=True, testing=False)

skipped = [
"fetching files",
"fetching files and verifying checksums",
"creating build dir, resetting environment",
"unpacking",
"patching",
Expand Down
3 changes: 2 additions & 1 deletion test/framework/toy_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3087,7 +3087,8 @@ def test_toy_build_trace(self):

patterns = [
r"^ >> installation prefix: .*/software/toy/0\.0$",
r"^== fetching files\.\.\.\n >> sources:\n >> .*/toy-0\.0\.tar\.gz \[SHA256: 44332000.*\]$",
r"^== fetching files and verifying checksums\.\.\.\n"
r" >> sources:\n >> .*/toy-0\.0\.tar\.gz \[SHA256: 44332000.*\]$",
r"^ >> applying patch toy-0\.0_fix-silly-typo-in-printf-statement\.patch$",
r'\n'.join([
r"^ >> running shell command:",
Expand Down
Loading