@@ -24,7 +24,6 @@ import testlib
24
24
SIZE_10G = "10000000000"
25
25
26
26
27
- @testlib .skipImage ("vdo not currently available in RHEL 10" , "rhel-10*" , "centos-10*" )
28
27
class TestStorageVDO (storagelib .StorageCase ):
29
28
30
29
provision = {"0" : {"memory_mb" : 1800 }}
@@ -34,6 +33,8 @@ class TestStorageVDO(storagelib.StorageCase):
34
33
b = self .browser
35
34
36
35
self .login_and_go ("/storage" )
36
+ # an empty xfs filesystem created with 6.4.0 is smaller then newer xfs versions
37
+ old_xfs = m .image .startswith ('rhel-9' ) or m .image .startswith ('centos-9' )
37
38
38
39
# Make a volume group in which to create the VDO LV
39
40
dev = "/dev/" + m .add_disk (SIZE_10G , serial = "DISK1" )["dev" ]
@@ -87,13 +88,13 @@ class TestStorageVDO(storagelib.StorageCase):
87
88
88
89
# compressible data should affect logical usage
89
90
m .execute ("dd if=/dev/zero of=/run/data/empty bs=1M count=1000" )
90
- b .wait_in_text (self .card_desc ("xfs filesystem" , "Usage" ), "1.2 / " )
91
+ b .wait_in_text (self .card_desc ("xfs filesystem" , "Usage" ), "1.2 / " if old_xfs else "1.3 / " )
91
92
# but not physical usage
92
93
b .wait_text (self .card_desc ("LVM2 VDO pool" , "Data used" ), "3.86 GB (64%)" )
93
94
94
95
# incompressible data
95
96
m .execute ("dd if=/dev/urandom of=/run/data/gibberish bs=1M count=1000" )
96
- b .wait_in_text (self .card_desc ("xfs filesystem" , "Usage" ), "2.2 / " )
97
+ b .wait_in_text (self .card_desc ("xfs filesystem" , "Usage" ), "2.2 / " if old_xfs else "2.3 / " )
97
98
# equal amount of physical space (not completely predictable due to random data)
98
99
b .wait_in_text (self .card_desc ("LVM2 VDO pool" , "Data used" ), "4." )
99
100
@@ -390,7 +391,6 @@ config: !Configuration
390
391
391
392
392
393
@testlib .onlyImage ("VDO API only supported on RHEL" , "rhel-*" , "centos-*" )
393
- @testlib .skipImage ("vdo not currently available in RHEL 10" , "rhel-10*" , "centos-10*" )
394
394
class TestStoragePackagesVDO (packagelib .PackageCase , storagelib .StorageHelpers ):
395
395
396
396
provision = {"0" : {"memory_mb" : 1500 }}
0 commit comments