From 2bc9bd3ef41b01fd00c8ca2939749be803aa965c Mon Sep 17 00:00:00 2001 From: Silvan Kaiser Date: Wed, 22 Mar 2017 12:34:42 +0100 Subject: [PATCH] Corrects Mitaka systemd-run patch with a missing variable change --- .../Mitaka/systemd-run_mitaka_plain-diff.patch | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/systemd-cgroup_patch/Mitaka/systemd-run_mitaka_plain-diff.patch b/systemd-cgroup_patch/Mitaka/systemd-run_mitaka_plain-diff.patch index 667b4bc..c26beee 100644 --- a/systemd-cgroup_patch/Mitaka/systemd-run_mitaka_plain-diff.patch +++ b/systemd-cgroup_patch/Mitaka/systemd-run_mitaka_plain-diff.patch @@ -100,24 +100,17 @@ index 8d16cad..78f42da 100644 @mock.patch.object(quobyte.LOG, "error") @mock.patch.object(utils, "execute") -@@ -324,12 +359,14 @@ class LibvirtQuobyteVolumeDriverTestCase( - - libvirt_driver.disconnect_volume(connection_info, "vde") - -- def test_libvirt_quobyte_driver_mount_non_quobyte_volume(self): -+ @mock.patch.object(libvirt_utils, 'is_mounted', return_value=True) -+ def test_libvirt_quobyte_driver_mount_non_quobyte_volume(self, -+ mock_is_mounted): +@@ -324,8 +359,8 @@ class LibvirtQuobyteVolumeDriverTestCase( mnt_base = '/mnt' self.flags(quobyte_mount_point_base=mnt_base, group='libvirt') - libvirt_driver = quobyte.LibvirtQuobyteVolumeDriver(self.fake_conn) + libvirt_driver = quobyte.LibvirtQuobyteVolumeDriver(self.fake_host) - export_string = 'quobyte://192.168.1.1/volume-00001' + export_string = 'quobyte:192.168.1.1/volume-00001' connection_info = {'data': {'export': export_string, 'name': self.name}} -@@ -345,6 +382,8 @@ class LibvirtQuobyteVolumeDriverTestCase( +@@ -341,6 +376,8 @@ class LibvirtQuobyteVolumeDriverTestCase( libvirt_driver.connect_volume, connection_info, self.disk_info)