Merge lp:~mpontillo/uvtool/fix-unit-tests-libvirt-register-error-handler into lp:~uvtool-dev/uvtool/trunk

[Mike Pontillo]

Fix unit tests to include libvirt.registerErrorHandler() call.

It looks like unit tests were broken as part of the fix for bug #1228231.

In order to get the unit tests passing (as specified in debian/rules) I had to make this change.

[Robie Basak (racb)]

Fixed in git master, thanks. Rather than adding the registerErrorHandler call, I just put the existing call in a list, which makes assert_has_calls work correctly. I was intending to test that "open" was called at least once, rather than the entire set.

=== modified file 'uvtool/tests/test_simplestreams.py'
--- uvtool/tests/test_simplestreams.py	2014-02-19 14:51:02 +0000
+++ uvtool/tests/test_simplestreams.py	2016-06-13 20:07:57 +0000
@@ -61,7 +61,10 @@
         # least once by uvtool.libvirt.simplestreams directly. This is more of
         # an assertion about the test being correct than part of the test
         # itself.
-        libvirt.assert_has_calls(mock.call.open(u'qemu:///system'))
+        libvirt.assert_has_calls([
+            mock.call.registerErrorHandler(mock.ANY, None),
+            mock.call.open(u'qemu:///system')
+        ])
 
         # create_volume_from_fobj should have been called exactly once to
         # create the volume with the name that we expect