From b01d53f42bf9adfbb93036ba7fd408c7e9518fb5 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Mon, 21 Feb 2022 10:36:15 -0700 Subject: [PATCH 1/3] update test for new jammy behavior --- tests/integration_tests/modules/test_apt.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration_tests/modules/test_apt.py b/tests/integration_tests/modules/test_apt.py index 6b3a8b7cc2d..7b9786e140d 100644 --- a/tests/integration_tests/modules/test_apt.py +++ b/tests/integration_tests/modules/test_apt.py @@ -155,6 +155,8 @@ def test_ppa_source(self, class_client: IntegrationInstance): assert ( "http://ppa.launchpad.net/simplestreams-dev/trunk/ubuntu" + in ppa_path_contents or + "https://ppa.launchpadcontent.net/simplestreams-dev/trunk/ubuntu/" in ppa_path_contents ) From 8d9ca20cfacba3cd623e352fa1f3dfa8bd4b9d83 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Mon, 21 Feb 2022 11:01:22 -0700 Subject: [PATCH 2/3] black and flake8 --- tests/integration_tests/modules/test_apt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration_tests/modules/test_apt.py b/tests/integration_tests/modules/test_apt.py index 7b9786e140d..a4481e7f53b 100644 --- a/tests/integration_tests/modules/test_apt.py +++ b/tests/integration_tests/modules/test_apt.py @@ -155,8 +155,8 @@ def test_ppa_source(self, class_client: IntegrationInstance): assert ( "http://ppa.launchpad.net/simplestreams-dev/trunk/ubuntu" - in ppa_path_contents or - "https://ppa.launchpadcontent.net/simplestreams-dev/trunk/ubuntu/" + in ppa_path_contents + or "https://ppa.launchpadcontent.net/simplestreams-dev/trunk/ubuntu/" in ppa_path_contents ) From a677b2486f8a945d35c0f9a5d295063aa9b69209 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Mon, 21 Feb 2022 12:47:01 -0700 Subject: [PATCH 3/3] specify url by release --- tests/integration_tests/modules/test_apt.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/integration_tests/modules/test_apt.py b/tests/integration_tests/modules/test_apt.py index a4481e7f53b..a74312656e9 100644 --- a/tests/integration_tests/modules/test_apt.py +++ b/tests/integration_tests/modules/test_apt.py @@ -152,11 +152,9 @@ 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" assert ( - "http://ppa.launchpad.net/simplestreams-dev/trunk/ubuntu" - in ppa_path_contents - or "https://ppa.launchpadcontent.net/simplestreams-dev/trunk/ubuntu/" + f"http://ppa.{host}.net/simplestreams-dev/trunk/ubuntu" in ppa_path_contents )