naughty: Adapt them to Storage redesign

cockpit-project · Nov 20, 2023 · b6e5fc4 · b6e5fc4
1 parent cecdddb
commit b6e5fc4
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 12 deletions.
diff --git a/naughty/arch/4796-stratis-runs-clevis-too-early b/naughty/arch/4796-stratis-runs-clevis-too-early
@@ -1,2 +1,2 @@
-  File "test/verify/check-storage-stratis", line *, in testBasic
-    self.wait_mounted(1, 1)  # should be mounted after boot
+  File "check-storage-stratis", line *, in testBasic
+    b.wait_visible(self.card("Encrypted Stratis pool"))  # should be started after boot
diff --git a/naughty/arch/4796-stratis-runs-clevis-too-early-old b/naughty/arch/4796-stratis-runs-clevis-too-early-old
@@ -0,0 +1,2 @@
+  File "test/verify/check-storage-stratis", line *, in testBasic
+    self.wait_mounted(1, 1)  # should be mounted after boot
diff --git a/naughty/arch/5434-udisks2-lvm2-on-luks-broken b/naughty/arch/5434-udisks2-lvm2-on-luks-broken
@@ -1,2 +1,2 @@
   File "check-storage-lvm2", line *, in testLvmOnLuks
-    self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))
+    b.wait_in_text(self.card_desc("LVM2 logical volume", "Physical volumes"), bn(disk))
diff --git a/naughty/arch/5434-udisks2-lvm2-on-luks-broken-old b/naughty/arch/5434-udisks2-lvm2-on-luks-broken-old
@@ -0,0 +1,2 @@
+  File "check-storage-lvm2", line *, in testLvmOnLuks
+    self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))
diff --git a/naughty/debian-testing/5434-udisks2-lvm2-on-luks-broken b/naughty/debian-testing/5434-udisks2-lvm2-on-luks-broken
@@ -1,2 +1,2 @@
   File "check-storage-lvm2", line *, in testLvmOnLuks
-    self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))
+    b.wait_in_text(self.card_desc("LVM2 logical volume", "Physical volumes"), bn(disk))
diff --git a/naughty/debian-testing/5434-udisks2-lvm2-on-luks-broken-old b/naughty/debian-testing/5434-udisks2-lvm2-on-luks-broken-old
@@ -0,0 +1,2 @@
+  File "check-storage-lvm2", line *, in testLvmOnLuks
+    self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))
diff --git a/naughty/fedora-38/4796-stratis-runs-clevis-too-early b/naughty/fedora-38/4796-stratis-runs-clevis-too-early
@@ -1,2 +1,2 @@
-  File "test/verify/check-storage-stratis", line *, in testBasic
-    self.wait_mounted(1, 1)  # should be mounted after boot
+  File "check-storage-stratis", line *, in testBasic
+    b.wait_visible(self.card("Encrypted Stratis pool"))  # should be started after boot
diff --git a/naughty/fedora-38/4796-stratis-runs-clevis-too-early-old b/naughty/fedora-38/4796-stratis-runs-clevis-too-early-old
@@ -0,0 +1,2 @@
+  File "test/verify/check-storage-stratis", line *, in testBasic
+    self.wait_mounted(1, 1)  # should be mounted after boot
diff --git a/naughty/fedora-39/4796-stratis-runs-clevis-too-early b/naughty/fedora-39/4796-stratis-runs-clevis-too-early
@@ -1,2 +1,2 @@
-  File "test/verify/check-storage-stratis", line *, in testBasic
-    self.wait_mounted(1, 1)  # should be mounted after boot
+  File "check-storage-stratis", line *, in testBasic
+    b.wait_visible(self.card("Encrypted Stratis pool"))  # should be started after boot
diff --git a/naughty/fedora-39/4796-stratis-runs-clevis-too-early-old b/naughty/fedora-39/4796-stratis-runs-clevis-too-early-old
@@ -0,0 +1,2 @@
+  File "test/verify/check-storage-stratis", line *, in testBasic
+    self.wait_mounted(1, 1)  # should be mounted after boot
diff --git a/naughty/fedora-39/5434-udisks2-lvm2-on-luks-broken b/naughty/fedora-39/5434-udisks2-lvm2-on-luks-broken
@@ -1,2 +1,2 @@
   File "check-storage-lvm2", line *, in testLvmOnLuks
-    self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))
+    b.wait_in_text(self.card_desc("LVM2 logical volume", "Physical volumes"), bn(disk))
diff --git a/naughty/fedora-39/5434-udisks2-lvm2-on-luks-broken-old b/naughty/fedora-39/5434-udisks2-lvm2-on-luks-broken-old
@@ -0,0 +1,2 @@
+  File "check-storage-lvm2", line *, in testLvmOnLuks
+    self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))
diff --git a/naughty/fedora-40/5434-udisks2-lvm2-on-luks-broken b/naughty/fedora-40/5434-udisks2-lvm2-on-luks-broken
@@ -1,2 +1,2 @@
   File "check-storage-lvm2", line *, in testLvmOnLuks
-    self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))
+    b.wait_in_text(self.card_desc("LVM2 logical volume", "Physical volumes"), bn(disk))
diff --git a/naughty/fedora-40/5434-udisks2-lvm2-on-luks-broken-old b/naughty/fedora-40/5434-udisks2-lvm2-on-luks-broken-old
@@ -0,0 +1,2 @@
+  File "check-storage-lvm2", line *, in testLvmOnLuks
+    self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))
diff --git a/naughty/rhel-9/4796-stratis-runs-clevis-too-early b/naughty/rhel-9/4796-stratis-runs-clevis-too-early
@@ -1,2 +1,2 @@
-  File "test/verify/check-storage-stratis", line *, in testBasic
-    self.wait_mounted(1, 1)  # should be mounted after boot
+  File "check-storage-stratis", line *, in testBasic
+    b.wait_visible(self.card("Encrypted Stratis pool"))  # should be started after boot
diff --git a/naughty/rhel-9/4796-stratis-runs-clevis-too-early-old b/naughty/rhel-9/4796-stratis-runs-clevis-too-early-old
@@ -0,0 +1,2 @@
+  File "test/verify/check-storage-stratis", line *, in testBasic
+    self.wait_mounted(1, 1)  # should be mounted after boot
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		File "test/verify/check-storage-stratis", line *, in testBasic
		self.wait_mounted(1, 1) # should be mounted after boot
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		File "check-storage-lvm2", line *, in testLvmOnLuks
		self.content_tab_wait_in_info(1, 1, "Physical volumes", bn(disk))