sts-sponsors team mailing list archive

[Adam Collard <mp+434481@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-ci/+git/system-tests:snap-proxy-fix into ~maas-committers/maas-ci/+git/system-tests:master.

Commit message:
fix: snap proxy.http{,s} separated by whitespace



Requested reviews:
  MAAS Lander (maas-lander): unittests
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/system-tests/+merge/434481

Avoids the ickery of

$ snap get system proxy
Key         Value
proxy.http  http://squid.internal:3128proxy.https=http://squid.internal:3128

-- 
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/system-tests:snap-proxy-fix into ~maas-committers/maas-ci/+git/system-tests:master.

diff --git a/systemtests/fixtures.py b/systemtests/fixtures.py
index 21b5f22..0d2a5ac 100644
--- a/systemtests/fixtures.py
+++ b/systemtests/fixtures.py
@@ -245,7 +245,7 @@ def maas_container(config: dict[str, Any], build_container: str) -> str:
             if http_proxy:
                 snap_proxy_cmd = (
                     f'snap set system proxy.http="{http_proxy}"'
-                    f'proxy.https="{http_proxy}"'
+                    f' proxy.https="{http_proxy}"'
                 )
                 cloud_config["snap"]["commands"].insert(0, snap_proxy_cmd)
         user_data = get_user_data(devices, cloud_config=cloud_config)