[PATCH] tests/avocado: Make the test_arm_bpim2u_gmac test more reliable

[PATCH] tests/avocado: Make the test_arm_bpim2u_gmac test more reliable

[Thomas Huth]

The test_arm_bpim2u_gmac test sometimes fails (ca. 1 out of 20 runs
here) since the disk shows up as /dev/mmcblk1 instead of /dev/mmcblk0
in some runs. No matter of the name in /dev, the major:minor encoding
seems always to be the same, so we can fix this issue by using the
correct major:minor hex number in the "root=" parameter instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/avocado/boot_linux_console.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 6ed660611f..6eab515718 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -869,7 +869,7 @@ def test_arm_bpim2u_gmac(self):
         self.vm.set_console()
         kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
                                'console=ttyS0,115200 '
-                               'root=/dev/mmcblk0 rootwait rw '
+                               'root=b300 rootwait rw '
                                'panic=-1 noreboot')
         self.vm.add_args('-kernel', kernel_path,
                          '-dtb', dtb_path,
@@ -885,7 +885,7 @@ def test_arm_bpim2u_gmac(self):
         exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
                                                 'Allwinner sun8i Family')
         exec_command_and_wait_for_pattern(self, 'cat /proc/partitions',
-                                                'mmcblk0')
+                                                'mmcblk')
         exec_command_and_wait_for_pattern(self, 'ifconfig eth0 up',
                                                  'eth0: Link is Up')
         exec_command_and_wait_for_pattern(self, 'udhcpc eth0',
-- 
2.39.3

Re: [PATCH] tests/avocado: Make the test_arm_bpim2u_gmac test more reliable

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> The test_arm_bpim2u_gmac test sometimes fails (ca. 1 out of 20 runs
> here) since the disk shows up as /dev/mmcblk1 instead of /dev/mmcblk0
> in some runs. No matter of the name in /dev, the major:minor encoding
> seems always to be the same, so we can fix this issue by using the
> correct major:minor hex number in the "root=" parameter instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Tested-by: Alex Bennée <alex.bennee@linaro.org>


Queued to maintainer/june-2023-omnibus, thanks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro