From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:48098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpGPp-0007IZ-68 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 12:46:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpGPo-0007vF-DJ for qemu-devel@nongnu.org; Thu, 31 Jan 2019 12:46:17 -0500 References: <20190117185628.21862-1-crosa@redhat.com> <20190117185628.21862-11-crosa@redhat.com> From: Wainer dos Santos Moschetta Message-ID: <9a116fb9-5e69-ab8e-1fb0-38f3e4c97186@redhat.com> Date: Thu, 31 Jan 2019 15:46:01 -0200 MIME-Version: 1.0 In-Reply-To: <20190117185628.21862-11-crosa@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Qemu-devel] [PATCH 10/18] Boot Linux Console Test: refactor the console watcher into utility method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cleber Rosa , qemu-devel@nongnu.org Cc: =?UTF-8?Q?Alex_Benn=c3=a9e?= , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Stefan Markovic , Aleksandar Markovic , Eduardo Habkost , Caio Carrara , qemu-s390x@nongnu.org, Aurelien Jarno , Cornelia Huck , Fam Zheng , Aleksandar Rikalo Hi Cleber, On 01/17/2019 04:56 PM, Cleber Rosa wrote: > This introduces a utility method that monitors the console device and > looks for either a message that signals the test success or failure. > > Signed-off-by: Cleber Rosa > --- > tests/acceptance/boot_linux_console.py | 30 ++++++++++++++++++-------- > 1 file changed, 21 insertions(+), 9 deletions(-) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index 35b31162d4..278bb2be3d 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -23,6 +23,25 @@ class BootLinuxConsole(Test): > > timeout = 60 > > + def wait_for_console_pattern(self, success_message, > + failure_message='Kernel panic - not syncing'): > + """ > + Waits for messages to appear on the console, while logging the content > + > + :param success_message: if this message appears, test succeeds > + :param failure_message: if this message appears, test fails > + """ What's the docstring format used here? I am wondering if :type is optional. - Wainer > + console = self.vm.console_socket.makefile() > + console_logger = logging.getLogger('console') > + while True: > + msg = console.readline() > + console_logger.debug(msg.strip()) > + if success_message in msg: > + break > + if failure_message in msg: > + fail = 'Failure message found in console: %s' % failure_message > + self.fail(fail) > + > def test_x86_64_pc(self): > """ > :avocado: tags=arch:x86_64 > @@ -39,12 +58,5 @@ class BootLinuxConsole(Test): > self.vm.add_args('-kernel', kernel_path, > '-append', kernel_command_line) > self.vm.launch() > - console = self.vm.console_socket.makefile() > - console_logger = logging.getLogger('console') > - while True: > - msg = console.readline() > - console_logger.debug(msg.strip()) > - if 'Kernel command line: %s' % kernel_command_line in msg: > - break > - if 'Kernel panic - not syncing' in msg: > - self.fail("Kernel panic reached") > + console_pattern = 'Kernel command line: %s' % kernel_command_line > + self.wait_for_console_pattern(console_pattern)