Merge ~hyask/auto-upgrade-testing-specifications:skia/fix_var_crash_hanging into auto-upgrade-testing-specifications:main

Proposed by Skia
Status: Merged
Merged at revision: 27cb1d26cad42316e7573bd8155890cfe50e9368
Proposed branch: ~hyask/auto-upgrade-testing-specifications:skia/fix_var_crash_hanging
Merge into: auto-upgrade-testing-specifications:main
Diff against target: 15 lines (+2/-1)
1 file modified
tests/check-var-crash-empty (+2/-1)
Reviewer Review Type Date Requested Status
Paride Legovini Approve
Review via email: mp+459918@code.launchpad.net

Description of the change

This fixed my bionic to focal upgrade tests locally, should also help on Jenkins.

Sample output:
```
#### Checking /var/crash ####
Ensuring `whoopsie` is finished running
 Error waiting for `whoopsie` (Command '['sudo', 'systemctl', 'start', 'whoopsie.service', '--wait']' timed out after 119.99996964399999 seconds), continuing anyway
 stdout: None
 stderr: None
Today is 2024-02-02
Failed to load ignore list from `scripts_data.json`: 'NoneType' object is not subscriptable
PASS: /var/crash is empty (good)
#### /var/crash checked (exit_code: 0) ####
```

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

Nice fixup!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/check-var-crash-empty b/tests/check-var-crash-empty
2index 04e8a7a..50e2c0e 100755
3--- a/tests/check-var-crash-empty
4+++ b/tests/check-var-crash-empty
5@@ -14,8 +14,9 @@ try:
6 subprocess.run(
7 ["sudo", "systemctl", "start", "whoopsie.service", "--wait"],
8 check=True,
9+ timeout=120,
10 )
11-except subprocess.CalledProcessError as e:
12+except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
13 print(f"\tError waiting for `whoopsie` ({e}), continuing anyway")
14 print(f"\tstdout: {e.stdout}")
15 print(f"\tstderr: {e.stderr}")

Subscribers

People subscribed via source and target branches

to all changes: