Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ def application_fixture(pytestconfig: pytest.Config, juju: jubilant.Juju, charm:
if pytestconfig.getoption("--use-existing") and app_name in juju.status().apps:
yield app_name
return
juju.deploy(
charm=charm,
app=app_name,
base="ubuntu@24.04",
)
juju.deploy(charm=charm, app=app_name, base="ubuntu@24.04", log=False)
yield app_name


Expand All @@ -94,6 +90,7 @@ def squid_proxy_fixture(pytestconfig: pytest.Config, juju: jubilant.Juju):
channel="latest/edge",
revision=22,
base="ubuntu@24.04",
log=False,
)
juju.wait(
lambda status: jubilant.all_active(status, SQUID_PROXY_APP),
Expand All @@ -120,5 +117,6 @@ def http_proxy_requirer_fixture(pytestconfig: pytest.Config, juju: jubilant.Juju
app=REQUIRER_APP,
base="ubuntu@24.04",
config={"http-proxy-domains": "ignored"},
log=False,
)
yield REQUIRER_APP
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def test_config_hostnames_and_paths(
values={
"http-proxy-domains": "canonical.com",
},
log=False,
)
juju.wait(
lambda status: jubilant.all_active(status, squid_proxy, application),
Expand All @@ -47,6 +48,7 @@ def test_config_hostnames_and_paths(
juju.config(
app=application,
values={"http-proxy-domains": "canonical.com", "http-proxy-auth": "srcip"},
log=False,
)
juju.wait(
lambda status: jubilant.all_active(status, squid_proxy, application, http_proxy_requirer),
Expand Down
Loading