Skip to contentSkip to conversation

tests/avocado: improve flaky ppc/pnv boot_linux_console.py test

PATCH In review Nicholas Piggin 2 participants 2 messages Jan 24, 2024 – Jan 25, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/avocado: improve flaky ppc/pnv boot_linux_console.py test

The expected MTD partition detection output does not always appear on the console, despite the test reaching the boot loader and the string appearing in dmesg. Possibly due to an init script that quietens the console output. Using an earlier log message improves reliability.

---
 tests/avocado/boot_linux_console.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tests/avocado/boot_linux_console.py +3 -1
index 3f0180e1f8..922a9e7b79 100644
@@ -1368,7 +1368,9 @@ def do_test_ppc64_powernv(self, proc):
         self.wait_for_console_pattern("CPU: " + proc + " generation processor")
         self.wait_for_console_pattern("zImage starting: loaded")
         self.wait_for_console_pattern("Run /init as init process")
-        self.wait_for_console_pattern("Creating 1 MTD partitions")
+        self.wait_for_console_pattern("rtc-opal opal-rtc: setting system clock")
+        # MTD partition detection output is sometimes cut off from console
+        # output, suspect S14silence-console init script.
 
     def test_ppc_powernv8(self):
         """
Signature · 1 line
2.42.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Nicholas Piggin

The expected MTD partition detection output does not always appear on the console, despite the test reaching the boot loader and the string appearing in dmesg. Possibly due to an init script that quietens the console output. Using an earlier log message improves reliability.

---
  tests/avocado/boot_linux_console.py | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
tests/avocado/boot_linux_console.py +0 -0
index 3f0180e1f8..922a9e7b79 100644

tests/avocado/boot_linux_console.py def do_test_ppc64_powernv(self, proc): · line 1376

Quoted 10 lines
tests/avocado/boot_linux_console.py +3 -1
@@ -1368,7 +1368,9 @@ def do_test_ppc64_powernv(self, proc):
          self.wait_for_console_pattern("CPU: " + proc + " generation processor")
          self.wait_for_console_pattern("zImage starting: loaded")
          self.wait_for_console_pattern("Run /init as init process")
-        self.wait_for_console_pattern("Creating 1 MTD partitions")
+        self.wait_for_console_pattern("rtc-opal opal-rtc: setting system clock")
+        # MTD partition detection output is sometimes cut off from console
+        # output, suspect S14silence-console init script.
 
      def test_ppc_powernv8(self):
          """

Thanks,

C.