Re: [PATCH 2/3] tests/avocado/machine_aspeed: Fix the broken ast2[56]00_evb_sdk tests

[Thomas Huth]

On 21/04/2023 14.54, Cédric Le Goater wrote:
> On 4/21/23 13:03, Thomas Huth wrote:
> > test_arm_ast2500_evb_sdk and test_arm_ast2600_evb_sdk are currently
> > failing. The problem is that they are trying to look for the login
> > prompt that does not have a newline at the end - but the logic in
> > _console_interaction() only handles full lines. It used to work by
> > accident in the past since there were sometimes kernel (warning and
> > error) messages popping up that finally provided a newline character
> > in the output, but since the tests have been changed to run with the
> > "quiet" kernel parameter, this is not working anymore.
> >
> > To make this work reliably, we must not look for the "login:" prompt,
> > but have to use some text ending with a newline instead. And in the
> > ast2600 test, switch to ssh instead of trying to log into the serial
> > console - this works much more reliable and also has the benefit of
>
> Yes. The test ran ~100 times without a failure. The 'dmesg -c' call is
> inelegant but there is not much other solutions.
>
> > excercising the network interface here a little bit, too.
>
> exercising
>
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
>
> Reviewed-by: Cédric Le Goater <clg@kaod.org>
>
> (one little typo below)
>
> Thanks,
>
> C.
>
> > ---
> >   tests/avocado/machine_aspeed.py | 31 ++++++++++++++++++-------------
> >   1 file changed, 18 insertions(+), 13 deletions(-)
> >
> > diff --git a/tests/avocado/machine_aspeed.py 
> > b/tests/avocado/machine_aspeed.py
> > index d2c57ccb7e..c9515bafa1 100644
> > --- a/tests/avocado/machine_aspeed.py
> > +++ b/tests/avocado/machine_aspeed.py
> > @@ -8,6 +8,7 @@
> >   import time
> >   import os
> > +from avocado_qemu import LinuxSSHMixIn
> >   from avocado_qemu import QemuSystemTest
> >   from avocado_qemu import wait_for_console_pattern
> >   from avocado_qemu import exec_command
> > @@ -230,7 +231,7 @@ def test_arm_ast2600_evb_buildroot(self):
> >           self.do_test_arm_aspeed_buildroot_poweroff()
> > -class AST2x00MachineSDK(QemuSystemTest):
> > +class AST2x00MachineSDK(QemuSystemTest, LinuxSSHMixIn):
> >       EXTRA_BOOTARGS = (
> >           'quiet '
> > @@ -257,7 +258,7 @@ def do_test_arm_aspeed_sdk_start(self, image):
> >           self.require_netdev('user')
> >           self.vm.set_console()
> >           self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
> > -                         '-net', 'nic', '-net', 'user')
> > +                         '-net', 'nic', '-net', 
> > 'user,hostfwd=:127.0.0.1:0-:22')
> >           self.vm.launch()
> >           self.wait_for_console_pattern('U-Boot 2019.04')
> > @@ -285,7 +286,7 @@ def test_arm_ast2500_evb_sdk(self):
> >           self.do_test_arm_aspeed_sdk_start(
> >               self.workdir + '/ast2500-default/image-bmc')
> > -        self.wait_for_console_pattern('ast2500-default login:')
> > +        self.wait_for_console_pattern('nodistro.0 ast2500-default ttyS4')
> >       @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
> >       def test_arm_ast2600_evb_sdk(self):
> > @@ -305,24 +306,28 @@ def test_arm_ast2600_evb_sdk(self):
> >                            
> > 'tmp105,bus=aspeed.i2c.bus.5,address=0x4d,id=tmp-test');
> >           self.vm.add_args('-device',
> >                            'ds1338,bus=aspeed.i2c.bus.5,address=0x32');
> > +        self.log.info('going to starrt *******')
>
> 's/rr/r'

Drat, that whole line was just a debug print that I wanted to remove before 
sending out the patch ... I'll fix it.

 Thomas


> >           self.do_test_arm_aspeed_sdk_start(
> >               self.workdir + '/ast2600-default/image-bmc')
> > -        self.wait_for_console_pattern('ast2600-default login:')
> > -        exec_command_and_wait_for_pattern(self, 'root', 'Password:')
> > -        exec_command_and_wait_for_pattern(self, '0penBmc', 
> > 'root@ast2600-default:~#')
> > +        self.wait_for_console_pattern('nodistro.0 ast2600-default ttyS4')
> > -        exec_command_and_wait_for_pattern(self,
> > -             'echo lm75 0x4d > /sys/class/i2c-dev/i2c-5/device/new_device',
> > +        self.ssh_connect('root', '0penBmc', False)
> > +        self.ssh_command('dmesg -c > /dev/null')
> > +
> > +        self.ssh_command_output_contains(
> > +             'echo lm75 0x4d > /sys/class/i2c-dev/i2c-5/device/new_device 
> > ; '
> > +             'dmesg -c',
> >                'i2c i2c-5: new_device: Instantiated device lm75 at 0x4d');
> > -        exec_command_and_wait_for_pattern(self,
> > +        self.ssh_command_output_contains(
> >                                'cat /sys/class/hwmon/hwmon19/temp1_input', 
> > '0')
> >           self.vm.command('qom-set', path='/machine/peripheral/tmp-test',
> >                           property='temperature', value=18000);
> > -        exec_command_and_wait_for_pattern(self,
> > +        self.ssh_command_output_contains(
> >                                'cat /sys/class/hwmon/hwmon19/temp1_input', 
> > '18000')
> > -        exec_command_and_wait_for_pattern(self,
> > -             'echo ds1307 0x32 > 
> > /sys/class/i2c-dev/i2c-5/device/new_device',
> > +        self.ssh_command_output_contains(
> > +             'echo ds1307 0x32 > 
> > /sys/class/i2c-dev/i2c-5/device/new_device ; '
> > +             'dmesg -c',
> >                'i2c i2c-5: new_device: Instantiated device ds1307 at 0x32');
> >           year = time.strftime("%Y")
> > -        exec_command_and_wait_for_pattern(self, 'hwclock -f /dev/rtc1', 
> > year);
> > +        self.ssh_command_output_contains('/sbin/hwclock -f /dev/rtc1', 
> > year);