diff -Nru virt-manager-1.5.1/debian/changelog virt-manager-1.5.1/debian/changelog --- virt-manager-1.5.1/debian/changelog 2018-10-09 14:57:42.000000000 +0000 +++ virt-manager-1.5.1/debian/changelog 2019-02-28 19:09:11.000000000 +0000 @@ -1,3 +1,10 @@ +virt-manager (1:1.5.1-0ubuntu1.2) bionic; urgency=medium + + * d/p/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch: + fix FTBFS due to self-tests failing with new osinfo (LP: #1796932) + + -- dann frazier Thu, 28 Feb 2019 19:09:11 +0000 + virt-manager (1:1.5.1-0ubuntu1.1) bionic; urgency=medium * d/p/lp-1794315-connection-avoid-failing-on-NoneType.patch: fix a race diff -Nru virt-manager-1.5.1/debian/patches/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch virt-manager-1.5.1/debian/patches/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch --- virt-manager-1.5.1/debian/patches/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch 1970-01-01 00:00:00.000000000 +0000 +++ virt-manager-1.5.1/debian/patches/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch 2019-02-28 19:08:13.000000000 +0000 @@ -0,0 +1,57 @@ +From 96a671dabf007201b2596c804acd9102a509f3a7 Mon Sep 17 00:00:00 2001 +From: Christian Ehrhardt +Date: Wed, 10 Oct 2018 10:17:13 +0200 +Subject: [PATCH] tests: osdict: fix ordering issue with new osinfo + +Newer versions of the osinfo database have entries for silverblue which +is derived from fedora and shares its urldistro (=fedora). + +That makes silverblue clumped and ordered with fedora entries which +breaks some assumptions that the test 'test_list_os' makes leading to: + File "/<>/tests/osdict.py", line 85, in test_list_os + assert found_fedora and found_rhel + +Fix those wrong assumptions to only expect ordering/grouping on the +.urldistro instead of the .name of the _OsVariant objects. + +Note: The code on master is unaffected due to [1], but the currently released +1.5.x series will fail to build due to that with recent versions of osinfo. + +Fixes https://bugs.launchpad.net/ubuntu/+source/virt-manager/+bug/1796932 + +[1]: https://github.com/virt-manager/virt-manager/commit/d52d9885c85623b8d924dbf0aceecb08b33e9122 + +Signed-off-by: Christian Ehrhardt + +Forwarded: yes, https://github.com/virt-manager/virt-manager/pull/35 +Author: Christian Ehrhardt +Origin: https://github.com/virt-manager/virt-manager/pull/35/commits/96a671dabf007201b2596c804acd9102a509f3a7 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1796932 +Last-Update: 2018-10-10 + +--- + tests/osdict.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/osdict.py b/tests/osdict.py +index 54c34e61..eff907e3 100644 +--- a/tests/osdict.py ++++ b/tests/osdict.py +@@ -71,12 +71,12 @@ class TestOSDB(unittest.TestCase): + found_fedora = False + found_rhel = False + for idx, osobj in enumerate(pref_list[:]): +- if osobj.name.startswith("fedora"): ++ if osobj.urldistro == "fedora": + found_fedora = True + continue + + for osobj2 in pref_list[idx:]: +- if osobj2.name.startswith("rhel"): ++ if osobj2.urldistro == "rhel": + found_rhel = True + continue + break +-- +2.17.1 + diff -Nru virt-manager-1.5.1/debian/patches/series virt-manager-1.5.1/debian/patches/series --- virt-manager-1.5.1/debian/patches/series 2018-10-09 14:57:42.000000000 +0000 +++ virt-manager-1.5.1/debian/patches/series 2019-02-28 19:08:28.000000000 +0000 @@ -6,3 +6,4 @@ add_qemu_binaries.patch prefer-qemu.patch lp-1794315-connection-avoid-failing-on-NoneType.patch +lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch