Merge autopkgtest-cloud:bug-2028796 into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Merged
Approved by: Tim Andersson
Approved revision: 7ccce6b8ae0fe324127eb972bb2c8605f5cf7199
Merged at revision: 7ccce6b8ae0fe324127eb972bb2c8605f5cf7199
Proposed branch: autopkgtest-cloud:bug-2028796
Merge into: autopkgtest-cloud:master
Diff against target: 16 lines (+4/-1)
1 file modified
charms/focal/autopkgtest-web/webcontrol/request/submit.py (+4/-1)
Reviewer Review Type Date Requested Status
Tim Andersson Approve
Review via email: mp+447804@code.launchpad.net

Description of the change

I cowboy'ed this change in production so that Ubuntu Developers could get back to queueing autopkgtests. In reflection a better fix for this might be to 'return False' if details is empty but I don't have the time right now to test his extensively.

To post a comment you must log in.
Revision history for this message
Tim Andersson (andersson123) wrote :

:facepalm: that's my bad. I don't think we should return false because maybe a test is triggered without triggers? or is that not possible?

Revision history for this message
Tim Andersson (andersson123) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charms/focal/autopkgtest-web/webcontrol/request/submit.py b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
2index aeeb9a9..1e31008 100644
3--- a/charms/focal/autopkgtest-web/webcontrol/request/submit.py
4+++ b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
5@@ -590,7 +590,10 @@ class Submit:
6 for req in packages["requests"]:
7 pkg = req[: req.find("{")].rstrip()
8 details = json.loads(req[req.find("{") :])
9- triggers = details["triggers"]
10+ try:
11+ triggers = details["triggers"]
12+ except KeyError:
13+ triggers = []
14 test = {
15 "release": release,
16 "arch": arch,

Subscribers

People subscribed via source and target branches