Merge pull request #1332 from vojtechtrefny/master_lvm-tests-fix

Various test fixes
storaged-project · Dec 10, 2024 · 8ffd11c · 8ffd11c
2 parents 3aeec53 + 268b9b8
commit 8ffd11c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/tests/dbus-tests/skip.yml b/src/tests/dbus-tests/skip.yml
@@ -29,15 +29,3 @@
     - distro: ["centos", "enterprise_linux"]
       version: "7"
       reason: "SCSI debug bug causing kernel panic on CentOS/RHEL 7"
-
-- test: test_80_filesystem.EXFATTestCase.test_uuid
-  skip_on:
-    - distro: "fedora"
-      version: ["39", "40", "41"]
-      reason: Setting UUID with LC_ALL=C.UTF-8 is broken with recent exfatprogs
-
-- test: test_20_LVM.UdisksLVMVDOTest
-  skip_on:
-    - distro: "centos"
-      version: "10"
-      reason: "vdo userspace tools are not yet available on RHEL/CentOS 10"
diff --git a/src/tests/dbus-tests/test_20_LVM.py b/src/tests/dbus-tests/test_20_LVM.py
@@ -434,7 +434,7 @@ def test_30_snapshot(self):
         # Create the origin LV
         vgsize = int(self.get_property_raw(vg, '.VolumeGroup', 'FreeSize'))
         lvname = 'udisks_test_origin_lv'
-        lv_path = vg.CreatePlainVolume(lvname, dbus.UInt64(vgsize / 2), self.no_options,
+        lv_path = vg.CreatePlainVolume(lvname, dbus.UInt64(vgsize // 3), self.no_options,
                                        dbus_interface=self.iface_prefix + '.VolumeGroup')
         lv = self.bus.get_object(self.iface_prefix, lv_path)
         self.assertIsNotNone(lv)
@@ -477,7 +477,7 @@ def test_40_cache(self):
         # Create the origin LV
         vgsize = int(self.get_property_raw(vg, '.VolumeGroup', 'FreeSize'))
         orig_lvname = 'udisks_test_origin_lv'
-        lv_path = vg.CreatePlainVolume(orig_lvname, dbus.UInt64(vgsize / 2), self.no_options,
+        lv_path = vg.CreatePlainVolume(orig_lvname, dbus.UInt64(vgsize // 3), self.no_options,
                                        dbus_interface=self.iface_prefix + '.VolumeGroup')
         lv = self.bus.get_object(self.iface_prefix, lv_path)
         self.assertIsNotNone(lv)
@@ -489,7 +489,7 @@ def test_40_cache(self):
         cache_lvname = 'udisks_test_cache_lv'
         vgsize = int(self.get_property_raw(vg, '.VolumeGroup', 'FreeSize'))
         # 8 MiB reserved for the cache metadata created automatically by LVM
-        lv_cache_path = vg.CreatePlainVolume(cache_lvname, dbus.UInt64((vgsize / 2) - 8 * 1024**2), self.no_options,
+        lv_cache_path = vg.CreatePlainVolume(cache_lvname, dbus.UInt64((vgsize // 3) - 8 * 1024**2), self.no_options,
                                              dbus_interface=self.iface_prefix + '.VolumeGroup')
         cache_lv = self.bus.get_object(self.iface_prefix, lv_cache_path)
         self.assertIsNotNone(cache_lv)