canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+462439@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:return-uuid-upon-test-request into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/462439
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:return-uuid-upon-test-request into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/request/app.py b/charms/focal/autopkgtest-web/webcontrol/request/app.py
index 84bc34d..78449bf 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/app.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/app.py
@@ -226,7 +226,7 @@ def index_root():
         except KeyError as e:
             return invalid("Missing field in JSON data: %s" % e)
 
-        s.send_amqp_request(context="upstream", **params)
+        params = s.send_amqp_request(context="upstream", **params)
         # write status file for pending test
         os.makedirs(os.path.join(PATH, "github-pending"), exist_ok=True)
         with open(
@@ -289,9 +289,9 @@ def index_root():
             ).format(**ChainMap(session, params))
 
         if params.get("ppas"):
-            s.send_amqp_request(context="ppa", **params)
+            params = s.send_amqp_request(context="ppa", **params)
         else:
-            s.send_amqp_request(**params)
+            params = s.send_amqp_request(**params)
         # add link to result page for Ubuntu results
         if not params.get("ppas"):
             url = os.path.join(
diff --git a/charms/focal/autopkgtest-web/webcontrol/request/submit.py b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
index 4633614..3c4d5c9 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/submit.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
@@ -350,6 +350,7 @@ class Submit:
                     amqp.Message(body, delivery_mode=2),  # persistent
                     routing_key=queue,
                 )
+        return params
 
     @classmethod
     def post_json(cls, url, data, auth_file, project):