canonical-ubuntu-qa team mailing list archive

[Paride Legovini <mp+447925@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/charms/focal/autopkgtest-web/webcontrol/request/submit.py b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
> index 1e31008..eefac44 100644
> --- a/charms/focal/autopkgtest-web/webcontrol/request/submit.py
> +++ b/charms/focal/autopkgtest-web/webcontrol/request/submit.py
> @@ -552,19 +552,22 @@ class Submit:
>                  releases = data[pkg][submitted].keys()
>                  for release in data[pkg][submitted]:
>                      architectures = data[pkg][submitted][release].keys()
> -                    triggers = submitted[submitted.find(";triggers_") + 1 :]
> -                    triggers = triggers[: triggers.find(";")]
> -                    triggers = triggers[
> -                        triggers.find("[") + 1 : triggers.find("]")
> -                    ]
> -                    triggers = triggers.replace("'", "").split(", ")
> -                    if (
> -                        req_arch in architectures
> -                        and req_series in releases
> -                        and req_package == pkg
> -                        and sorted(triggers) == sorted(req_triggers)
> -                    ):
> -                        return True
> +                    for arch in architectures:
> +                        triggers = []
> +                        if (

If you use .get() you can specify a default for when a key is not present. This should work:

triggers = data[pkg][submitted][release][arch][0].get("triggers", [])

removing the need for this if.

> +                            "triggers"
> +                            in data[pkg][submitted][release][arch][0].keys()
> +                        ):
> +                            triggers = data[pkg][submitted][release][arch][0][
> +                                "triggers"
> +                            ]
> +                        if (
> +                            req_arch in architectures
> +                            and req_series in releases
> +                            and req_package == pkg
> +                            and sorted(triggers) == sorted(req_triggers)
> +                        ):
> +                            return True
>          return False
>  
>      def is_test_in_queue(


-- 
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/447925
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:amend_json_parsing into autopkgtest-cloud:master.