| Message ID | 20190520220635.10961-2-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests: Avocado-test for the SmartFusion2 board | expand |
On Mon, May 20, 2019 at 3:07 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Avoid to log empty lines in console debug logs. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > tests/acceptance/boot_linux_console.py | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index d5c500ea30..f593f3858e 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -37,8 +37,10 @@ class BootLinuxConsole(Test): > console = self.vm.console_socket.makefile() > console_logger = logging.getLogger('console') > while True: > - msg = console.readline() > - console_logger.debug(msg.strip()) > + msg = console.readline().strip() > + if not msg: > + continue > + console_logger.debug(msg) > if success_message in msg: > break > if failure_message in msg: > -- > 2.19.1 > >
----- Original Message ----- > From: "Philippe Mathieu-Daudé" <f4bug@amsat.org> > To: qemu-devel@nongnu.org > Cc: "Eduardo Habkost" <ehabkost@redhat.com>, "Caio Carrara" <ccarrara@redhat.com>, "Alistair Francis" > <alistair@alistair23.me>, "Subbaraya Sundeep" <sundeep.lkml@gmail.com>, qemu-arm@nongnu.org, "Cleber Rosa" > <crosa@redhat.com>, "Peter Maydell" <peter.maydell@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org> > Sent: Monday, May 20, 2019 6:06:34 PM > Subject: [PATCH 1/2] BootLinuxConsoleTest: Do not log empty lines > > Avoid to log empty lines in console debug logs. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/acceptance/boot_linux_console.py | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tests/acceptance/boot_linux_console.py > b/tests/acceptance/boot_linux_console.py > index d5c500ea30..f593f3858e 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -37,8 +37,10 @@ class BootLinuxConsole(Test): > console = self.vm.console_socket.makefile() > console_logger = logging.getLogger('console') > while True: > - msg = console.readline() > - console_logger.debug(msg.strip()) > + msg = console.readline().strip() > + if not msg: > + continue > + console_logger.debug(msg) > if success_message in msg: > break > if failure_message in msg: > -- > 2.19.1 > > Reviewed-by: Cleber Rosa <crosa@redhat.com>
On Tue, May 21, 2019 at 12:06:34AM +0200, Philippe Mathieu-Daudé wrote: > Avoid to log empty lines in console debug logs. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/acceptance/boot_linux_console.py | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index d5c500ea30..f593f3858e 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -37,8 +37,10 @@ class BootLinuxConsole(Test): > console = self.vm.console_socket.makefile() > console_logger = logging.getLogger('console') > while True: > - msg = console.readline() > - console_logger.debug(msg.strip()) > + msg = console.readline().strip() > + if not msg: > + continue > + console_logger.debug(msg) > if success_message in msg: > break > if failure_message in msg: > -- > 2.19.1 > This is particularly useful in the boot_linux_console.py:BootLinuxConsole.test_s390x_s390_ccw_virtio test, where in my experience empty lines were being logged. Reviewed-by: Cleber Rosa <crosa@redhat.com> Tested-by: Cleber Rosa <crosa@redhat.com>
On May 21, 2019 12:07 AM, "Philippe Mathieu-Daudé" <f4bug@amsat.org> wrote: > > Avoid to log empty lines in console debug logs. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- Acked-by: Aleksandar Markovic <amarkovic@wavecomp.com> > tests/acceptance/boot_linux_console.py | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index d5c500ea30..f593f3858e 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -37,8 +37,10 @@ class BootLinuxConsole(Test): > console = self.vm.console_socket.makefile() > console_logger = logging.getLogger('console') > while True: > - msg = console.readline() > - console_logger.debug(msg.strip()) > + msg = console.readline().strip() > + if not msg: > + continue > + console_logger.debug(msg) > if success_message in msg: > break > if failure_message in msg: > -- > 2.19.1 > >
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index d5c500ea30..f593f3858e 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -37,8 +37,10 @@ class BootLinuxConsole(Test): console = self.vm.console_socket.makefile() console_logger = logging.getLogger('console') while True: - msg = console.readline() - console_logger.debug(msg.strip()) + msg = console.readline().strip() + if not msg: + continue + console_logger.debug(msg) if success_message in msg: break if failure_message in msg:
Avoid to log empty lines in console debug logs. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/acceptance/boot_linux_console.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)