| Message ID | 20241112062806.838717-5-clg@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | tests/functional: Finish conversion of Aspeed tests | expand |
On 12/11/2024 07.28, Cédric Le Goater wrote: > These were introduced in the avocado tests to workaround read issues > when interacting with console. They are no longer necessary. > > Signed-off-by: Cédric Le Goater <clg@redhat.com> > --- > tests/functional/test_arm_aspeed.py | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py > index bdd5771a794e..07a8905e2365 100755 > --- a/tests/functional/test_arm_aspeed.py > +++ b/tests/functional/test_arm_aspeed.py > @@ -136,10 +136,8 @@ def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB' > self.wait_for_console_pattern('lease of 10.0.2.15') > # the line before login: > self.wait_for_console_pattern(pattern) Could we please wait for the "login:" string now instead, to make sure that there is no race between detecting the previous line and the real login prompt? > - time.sleep(0.1) > - exec_command(self, 'root') > - time.sleep(0.1) > - exec_command(self, "passw0rd") > + exec_command_and_wait_for_pattern(self, 'root', 'Password:') > + exec_command_and_wait_for_pattern(self, 'passw0rd', '#') > > def do_test_arm_aspeed_buildroot_poweroff(self): > exec_command_and_wait_for_pattern(self, 'poweroff', > @@ -210,7 +208,6 @@ def test_arm_ast2600_evb_buildroot(self): > 'echo slave-24c02 0x1064 > /sys/bus/i2c/devices/i2c-3/new_device', > 'i2c i2c-3: new_device: Instantiated device slave-24c02 at 0x64'); > exec_command(self, 'i2cset -y 3 0x42 0x64 0x00 0xaa i'); Could please you change the above line to wait for the shell prompt pattern now? Thanks, Thomas > - time.sleep(0.1) > exec_command_and_wait_for_pattern(self, > 'hexdump /sys/bus/i2c/devices/3-1064/slave-eeprom', > '0000000 ffaa ffff ffff ffff ffff ffff ffff ffff');
On 11/12/24 08:14, Thomas Huth wrote: > On 12/11/2024 07.28, Cédric Le Goater wrote: >> These were introduced in the avocado tests to workaround read issues >> when interacting with console. They are no longer necessary. >> >> Signed-off-by: Cédric Le Goater <clg@redhat.com> >> --- >> tests/functional/test_arm_aspeed.py | 7 ++----- >> 1 file changed, 2 insertions(+), 5 deletions(-) >> >> diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py >> index bdd5771a794e..07a8905e2365 100755 >> --- a/tests/functional/test_arm_aspeed.py >> +++ b/tests/functional/test_arm_aspeed.py >> @@ -136,10 +136,8 @@ def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB' >> self.wait_for_console_pattern('lease of 10.0.2.15') >> # the line before login: >> self.wait_for_console_pattern(pattern) > > Could we please wait for the "login:" string now instead, to make sure that there is no race between detecting the previous line and the real login prompt? Yes. I have done that in other tests. I should do it in this test also. Thanks, C.
diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py index bdd5771a794e..07a8905e2365 100755 --- a/tests/functional/test_arm_aspeed.py +++ b/tests/functional/test_arm_aspeed.py @@ -136,10 +136,8 @@ def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB' self.wait_for_console_pattern('lease of 10.0.2.15') # the line before login: self.wait_for_console_pattern(pattern) - time.sleep(0.1) - exec_command(self, 'root') - time.sleep(0.1) - exec_command(self, "passw0rd") + exec_command_and_wait_for_pattern(self, 'root', 'Password:') + exec_command_and_wait_for_pattern(self, 'passw0rd', '#') def do_test_arm_aspeed_buildroot_poweroff(self): exec_command_and_wait_for_pattern(self, 'poweroff', @@ -210,7 +208,6 @@ def test_arm_ast2600_evb_buildroot(self): 'echo slave-24c02 0x1064 > /sys/bus/i2c/devices/i2c-3/new_device', 'i2c i2c-3: new_device: Instantiated device slave-24c02 at 0x64'); exec_command(self, 'i2cset -y 3 0x42 0x64 0x00 0xaa i'); - time.sleep(0.1) exec_command_and_wait_for_pattern(self, 'hexdump /sys/bus/i2c/devices/3-1064/slave-eeprom', '0000000 ffaa ffff ffff ffff ffff ffff ffff ffff');
These were introduced in the avocado tests to workaround read issues when interacting with console. They are no longer necessary. Signed-off-by: Cédric Le Goater <clg@redhat.com> --- tests/functional/test_arm_aspeed.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)