Skip to content

Commit

Permalink
Merge bitcoin#30703: test: Avoid duplicate curl call in get_previous_…
Browse files Browse the repository at this point in the history
…releases.py

fa5aeab test: Avoid duplicate curl call in get_previous_releases.py (MarcoFalke)

Pull request description:

  Seems odd having to translate `404` to "Binary tag was not found". Also, it seems odd to write a for-loop over a list with one item.

  Fix both issues by just using a single call to `curl --fail ...`.

  Can be tested with: `test/get_previous_releases.py -b v99.99.99`

  Before:

  ```
  Releases directory: releases
  Fetching: https://bitcoincore.org/bin/bitcoin-core-99.99.99/bitcoin-99.99.99-x86_64-linux-gnu.tar.gz
    % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                   Dload  Upload   Total   Spent    Left  Speed
    0  286k    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
  Binary tag was not found
  ```

  After:

  ```
  Releases directory: releases
  Fetching: https://bitcoincore.org/bin/bitcoin-core-99.99.99/bitcoin-99.99.99-x86_64-linux-gnu.tar.gz
    % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                   Dload  Upload   Total   Spent    Left  Speed
    0  286k    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
  curl: (22) The requested URL returned error: 404

ACKs for top commit:
  fanquake:
    ACK fa5aeab
  brunoerg:
    utACK fa5aeab
  tdb3:
    tested ACK fa5aeab

Tree-SHA512: d5d31e0bccdd9de9b4a8ecf2e69348f4e8cee773050c8259b61db1ce5de73f6fbfffbe8c4d2571f7bef2de29cb42fd244573deebfbec614e487e76ef41681b9c
  • Loading branch information
fanquake committed Aug 24, 2024
2 parents c81c6bf + fa5aeab commit d54fbc8
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions test/get_previous_releases.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,9 @@ def download_binary(tag, args) -> int:

print('Fetching: {tarballUrl}'.format(tarballUrl=tarballUrl))

header, status = subprocess.Popen(
['curl', '--head', tarballUrl], stdout=subprocess.PIPE).communicate()
if re.search("404 Not Found", header.decode("utf-8")):
print("Binary tag was not found")
return 1

curlCmds = [
['curl', '--remote-name', tarballUrl]
]

for cmd in curlCmds:
ret = subprocess.run(cmd).returncode
if ret:
return ret
ret = subprocess.run(['curl', '--fail', '--remote-name', tarballUrl]).returncode
if ret:
return ret

hasher = hashlib.sha256()
with open(tarball, "rb") as afile:
Expand Down

0 comments on commit d54fbc8

Please sign in to comment.