canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+460092@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:add-test-name-feat 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/460092
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:add-test-name-feat 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 d6c57e9..d049ae7 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/app.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/app.py
@@ -155,6 +155,10 @@ def index_root():
         for e in params["env"]:
             splitenv += e.split(";")
         params["env"] = splitenv
+    
+    # if "test-name" in params
+    # dont think this is even needed actually!
+    # test_name = params.get("test-name", None)
 
     # request from github?
     if b"api.github.com" in request.data:
diff --git a/charms/focal/autopkgtest-web/webcontrol/request/submit.py b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
index 3466254..678ccc0 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/submit.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
@@ -710,5 +710,11 @@ class Submit:
 
     def validate_args(self, parameters):
         base = ["arch", "release", "package", "triggers"]
+        possible_extras = ["test-name", "all-proposed"]
         if not set(base).issubset(set(parameters.keys())):
             raise InvalidArgs(parameters)
+        param_cpy = parameters
+        for b in base:
+            param_cpy.remove(b)
+        if not set(parameters).issubset(set(possible_extras)):
+            raise InvalidArgs(parameters)