From 41b65112bd4ccabe2b11358ad2c943ebb3b54467 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Wed, 23 Feb 2022 08:05:38 -0700 Subject: [PATCH 1/2] Try again --- tests/integration_tests/modules/test_apt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration_tests/modules/test_apt.py b/tests/integration_tests/modules/test_apt.py index dddaca0b6a3..cfb18494acb 100644 --- a/tests/integration_tests/modules/test_apt.py +++ b/tests/integration_tests/modules/test_apt.py @@ -152,7 +152,7 @@ def test_ppa_source(self, class_client: IntegrationInstance): "/etc/apt/sources.list.d/" "simplestreams-dev-ubuntu-trunk-{}.list".format(release) ) - host = "launchpad" if release == "jammy" else "launchpadcontent" + host = "launchpadcontent" if release == "jammy" else "launchpad" assert ( f"://ppa.{host}.net/simplestreams-dev/trunk/ubuntu" in ppa_path_contents From e0519added08de11176fe9e7d63ae4b3a5c6352a Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Wed, 23 Feb 2022 08:59:37 -0700 Subject: [PATCH 2/2] permissively allow either launchpadcontent or launchpad --- tests/integration_tests/modules/test_apt.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/integration_tests/modules/test_apt.py b/tests/integration_tests/modules/test_apt.py index cfb18494acb..2e07b33b04f 100644 --- a/tests/integration_tests/modules/test_apt.py +++ b/tests/integration_tests/modules/test_apt.py @@ -152,9 +152,10 @@ def test_ppa_source(self, class_client: IntegrationInstance): "/etc/apt/sources.list.d/" "simplestreams-dev-ubuntu-trunk-{}.list".format(release) ) - host = "launchpadcontent" if release == "jammy" else "launchpad" assert ( - f"://ppa.{host}.net/simplestreams-dev/trunk/ubuntu" + "://ppa.launchpad.net/simplestreams-dev/trunk/ubuntu" + in ppa_path_contents + or "://ppa.launchpadcontent.net/simplestreams-dev/trunk/ubuntu" in ppa_path_contents )