On Fri, 11 Dec 2020 18:31:32 +0100 Thomas Huth <th...@redhat.com> wrote:
> We will use this in more spots soon, so it's easier to put this into > a separate function. > > Signed-off-by: Thomas Huth <th...@redhat.com> > --- > tests/acceptance/machine_s390_ccw_virtio.py | 30 ++++++++++++--------- > 1 file changed, 17 insertions(+), 13 deletions(-) > > diff --git a/tests/acceptance/machine_s390_ccw_virtio.py > b/tests/acceptance/machine_s390_ccw_virtio.py > index 864ef4ee6e..733a7ca24a 100644 > --- a/tests/acceptance/machine_s390_ccw_virtio.py > +++ b/tests/acceptance/machine_s390_ccw_virtio.py > @@ -17,12 +17,24 @@ from avocado_qemu import wait_for_console_pattern > class S390CCWVirtioMachine(Test): > KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' > > + timeout = 120 > + > def wait_for_console_pattern(self, success_message, vm=None): > wait_for_console_pattern(self, success_message, > failure_message='Kernel panic - not > syncing', > vm=vm) > > - timeout = 120 > + def wait_for_crw_reports(self): > + exec_command_and_wait_for_pattern(self, > + 'while ! (dmesg -c | grep CRW) ; do sleep 1 ; done', > + 'CRW reports') > + > + dmesg_clear_count = 1 > + def clear_guests_dmesg(self): <nitpick> Maybe clear_guest_dmesg? </nitpick> > + exec_command_and_wait_for_pattern(self, 'dmesg -c > /dev/null; ' > + 'echo dm_clear\ ' + str(self.dmesg_clear_count), > + 'dm_clear ' + str(self.dmesg_clear_count)) > + self.dmesg_clear_count += 1 > > def test_s390x_devices(self): >
