canonical-ubuntu-qa team mailing list archive

[Skia <mp+459918@xxxxxxxxxxxxxxxxxx>]

Skia has proposed merging ~hyask/auto-upgrade-testing-specifications:skia/fix_var_crash_hanging into auto-upgrade-testing-specifications:main.

Requested reviews:
  Canonical Platform QA Team (canonical-platform-qa)

For more details, see:
https://code.launchpad.net/~hyask/auto-upgrade-testing-specifications/+git/auto-upgrade-testing-specifications/+merge/459918

This fixed my bionic to focal upgrade tests locally, should also help on Jenkins.
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of ~hyask/auto-upgrade-testing-specifications:skia/fix_var_crash_hanging into auto-upgrade-testing-specifications:main.

diff --git a/tests/check-var-crash-empty b/tests/check-var-crash-empty
index 04e8a7a..50e2c0e 100755
--- a/tests/check-var-crash-empty
+++ b/tests/check-var-crash-empty
@@ -14,8 +14,9 @@ try:
     subprocess.run(
         ["sudo", "systemctl", "start", "whoopsie.service", "--wait"],
         check=True,
+        timeout=120,
     )
-except subprocess.CalledProcessError as e:
+except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
     print(f"\tError waiting for `whoopsie` ({e}), continuing anyway")
     print(f"\tstdout: {e.stdout}")
     print(f"\tstderr: {e.stderr}")