diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 338c24d..28f25a1 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -103,10 +103,10 @@ def deploy_charms_fixture( pytestconfig: Pytest configuration object. """ base = pytestconfig.getoption("--base", default="24.04") - juju.deploy("ubuntu", base=f"ubuntu@{base}", constraints={"virt-type": "virtual-machine"}) - juju.deploy(aproxy_charm_file) - juju.integrate("ubuntu", "aproxy") - juju.cli("config", "aproxy", f"proxy-address={tinyproxy_url}:8888") + juju.deploy("ubuntu", base=f"ubuntu@{base}", constraints={"virt-type": "virtual-machine"}, log=False) + juju.deploy(aproxy_charm_file, log=False) + juju.integrate("ubuntu", "aproxy", log=False) + juju.config("aproxy", {"proxy-address": f"{tinyproxy_url}:8888"}, log=False) juju.wait(jubilant.all_active, timeout=20 * 60) diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index 2495542..f22de6b 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -46,8 +46,8 @@ def test_aproxy_reads_model_proxy(juju, aproxy_app, tinyproxy_url): act: set the model config juju-http-proxy, then unset aproxy proxy-address. assert: aproxy reads proxy values from the model config. """ - juju.cli("model-config", f"juju-http-proxy=http://{tinyproxy_url}:8888") - juju.cli("config", "aproxy", "--reset", "proxy-address") + juju.model_config({"juju-http-proxy": f"http://{tinyproxy_url}:8888"}, log=False) + juju.config("aproxy", reset="proxy-address", log=False) juju.wait(jubilant.all_active, timeout=5 * 60) units = juju.status().get_units(aproxy_app.name) diff --git a/tests/integration/tinyproxy.py b/tests/integration/tinyproxy.py index 5114181..3845231 100644 --- a/tests/integration/tinyproxy.py +++ b/tests/integration/tinyproxy.py @@ -71,6 +71,7 @@ def _on_install(self, _): base=base, config={"src-overwrite": json.dumps({"any_charm.py": any_charm_py})}, constraints={"virt-type": "virtual-machine"}, + log=False, ) # Wait until the service is up