From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A37ABC2BCA1 for ; Fri, 7 Jun 2019 21:22:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3711720868 for ; Fri, 7 Jun 2019 21:22:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3711720868 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMJQ-0003EM-C8 for qemu-devel@archiver.kernel.org; Fri, 07 Jun 2019 17:22:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37781) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZMDU-0006zg-UB for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZMDT-0002VS-T3 for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36959) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZMDT-0002U0-Mj for qemu-devel@nongnu.org; Fri, 07 Jun 2019 17:16:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D865F30820EA; Fri, 7 Jun 2019 21:16:02 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B25F5D70D; Fri, 7 Jun 2019 21:15:58 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org, Cleber Rosa Date: Fri, 7 Jun 2019 18:15:40 -0300 Message-Id: <20190607211544.7964-5-ehabkost@redhat.com> In-Reply-To: <20190607211544.7964-1-ehabkost@redhat.com> References: <20190607211544.7964-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 07 Jun 2019 21:16:02 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/8] BootLinuxConsoleTest: Do not log empty lines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 Avoid to log empty lines in console debug logs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190520220635.10961-2-f4bug@amsat.org> Reviewed-by: Alistair Francis Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa Acked-by: Aleksandar Markovic Signed-off-by: Eduardo Habkost --- 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/bo= ot_linux_console.py index 6aa084e049..e86e66900a 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -37,8 +37,10 @@ class BootLinuxConsole(Test): console =3D self.vm.console_socket.makefile() console_logger =3D logging.getLogger('console') while True: - msg =3D console.readline() - console_logger.debug(msg.strip()) + msg =3D console.readline().strip() + if not msg: + continue + console_logger.debug(msg) if success_message in msg: break if failure_message in msg: --=20 2.18.0.rc1.1.g3f1ff2140