Manually reverting last so called bugfix.

quobyte · Mar 23, 2017 · 11d758a · 11d758a
1 parent 38edd6f
commit 11d758a
Showing 1 changed file with 10 additions and 3 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
@@ -100,17 +100,24 @@ index 8d16cad..78f42da 100644
 
      @mock.patch.object(quobyte.LOG, "error")
      @mock.patch.object(utils, "execute")
-@@ -324,8 +359,8 @@ class LibvirtQuobyteVolumeDriverTestCase(
+@@ -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):
          mnt_base = '/mnt'
          self.flags(quobyte_mount_point_base=mnt_base, group='libvirt')
 
-         libvirt_driver = quobyte.LibvirtQuobyteVolumeDriver(self.fake_host)
+         libvirt_driver = quobyte.LibvirtQuobyteVolumeDriver(self.fake_conn)
 -        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}}
-@@ -341,6 +376,8 @@ class LibvirtQuobyteVolumeDriverTestCase(
+@@ -345,6 +382,8 @@ class LibvirtQuobyteVolumeDriverTestCase(
                                libvirt_driver.connect_volume,
                                connection_info,
                                self.disk_info)