diff -Nru ubuntu-release-upgrader-20.04.34/debian/changelog ubuntu-release-upgrader-20.04.35/debian/changelog --- ubuntu-release-upgrader-20.04.34/debian/changelog 2021-07-01 18:57:22.000000000 +0000 +++ ubuntu-release-upgrader-20.04.35/debian/changelog 2021-07-02 23:51:29.000000000 +0000 @@ -1,3 +1,10 @@ +ubuntu-release-upgrader (1:20.04.35) focal; 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 Fri, 02 Jul 2021 16:51:29 -0700 + ubuntu-release-upgrader (1:20.04.34) focal; urgency=medium * DistUpgrade/DistUpgradeQuirks.py: If universe is not enabled and the diff -Nru ubuntu-release-upgrader-20.04.34/tests/test_sources_list.py ubuntu-release-upgrader-20.04.35/tests/test_sources_list.py --- ubuntu-release-upgrader-20.04.34/tests/test_sources_list.py 2021-07-01 18:18:02.000000000 +0000 +++ ubuntu-release-upgrader-20.04.35/tests/test_sources_list.py 2021-07-02 23:15:21.000000000 +0000 @@ -575,22 +575,13 @@ 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") def test_partner_update(self, mock_sourcesListEntryDownloadable):