[neon/forks/ubuntu-release-upgrader/Neon/unstable_focal] /: tests/test_sources_list.py: remove a port architecture test as the code change has not been SRU'ed to 20.04.

[Brian Murray]

Git commit 7090b18d0ac1a37079db7cd8da5e3e8e9fa53f17 by Brian Murray.
Committed on 02/07/2021 at 23:17.
Pushed by jriddell into branch 'Neon/unstable_focal'.

tests/test_sources_list.py: remove a port architecture test as the code change has not been SRU'ed to 20.04.

M  +7    -0    debian/changelog
M  +1    -10   tests/test_sources_list.py

https://invent.kde.org/neon/forks/ubuntu-release-upgrader/commit/7090b18d0ac1a37079db7cd8da5e3e8e9fa53f17

diff --git a/debian/changelog b/debian/changelog
index e24372b6..3211d6ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubuntu-release-upgrader (1:20.04.35) UNRELEASED; urgency=medium
+
+  * tests/test_sources_list.py: remove a port architecture test as the code
+    change has not been SRU'ed to 20.04.
+
+ -- Brian Murray <brian at ubuntu.com>  Fri, 02 Jul 2021 16:15:41 -0700
+
 ubuntu-release-upgrader (1:20.04.34) focal; urgency=medium
 
   * DistUpgrade/DistUpgradeQuirks.py: If universe is not enabled and the
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
index 5a69fae5..ee2732a1 100644
--- a/tests/test_sources_list.py
+++ b/tests/test_sources_list.py
@@ -575,21 +575,12 @@ deb http://old-releases.ubuntu.com/ubuntu %s-security main restricted
         d.openCache(lock=False)
         res = d.updateSourcesList()
         self.assertTrue(res)
-        if ARCH in ('amd64', 'i386'):
-            self._verifySources("""
+        self._verifySources("""
 # main repo
 deb http://archive.ubuntu.com/ubuntu %s main restricted multiverse universe
 deb-src http://archive.ubuntu.com/ubuntu %s main restricted multiverse
 
 deb http://archive.ubuntu.com/ubuntu %s-security main restricted universe multiverse
-""" % (to_dist, to_dist, to_dist))
-        else:
-            self._verifySources("""
-# main repo
-deb http://ports.ubuntu.com/ubuntu-ports/ %s main restricted multiverse universe
-deb-src http://archive.ubuntu.com/ubuntu %s main restricted multiverse
-
-deb http://ports.ubuntu.com/ubuntu-ports/ %s-security main restricted universe multiverse
 """ % (to_dist, to_dist, to_dist))
 
     @mock.patch("DistUpgrade.DistUpgradeController.DistUpgradeController._sourcesListEntryDownloadable")