{"id":2013902,"url":"http://patchwork.ozlabs.org/api/patches/2013902/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20241121154218.1423005-15-berrange@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20241121154218.1423005-15-berrange@redhat.com>","list_archive_url":null,"date":"2024-11-21T15:42:14","name":"[v2,14/18] tests/functional: require non-NULL success_message for console wait","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"088aeda2427d0b50e372db82a4b6105c0b5ba12a","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/people/2694/?format=json","name":"Daniel P. Berrangé","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20241121154218.1423005-15-berrange@redhat.com/mbox/","series":[{"id":433720,"url":"http://patchwork.ozlabs.org/api/series/433720/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=433720","date":"2024-11-21T15:42:05","name":"test/functional: improve functional test debugging & fix tuxrun","version":2,"mbox":"http://patchwork.ozlabs.org/series/433720/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2013902/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2013902/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=VhvPX5Rn;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4XvN1L1cwSz1yCg\n\tfor ; Fri, 22 Nov 2024 02:48:22 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1tE9Ls-00028B-Gr; Thu, 21 Nov 2024 10:44:16 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1tE9Lg-0001FR-8F\n for qemu-devel@nongnu.org; Thu, 21 Nov 2024 10:44:04 -0500","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1tE9Le-00012c-HS\n for qemu-devel@nongnu.org; Thu, 21 Nov 2024 10:44:03 -0500","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-6-dGVVZri8M3GeIJjEf8DOWQ-1; Thu,\n 21 Nov 2024 10:43:58 -0500","from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 6B7E21954226; Thu, 21 Nov 2024 15:43:57 +0000 (UTC)","from toolbox.redhat.com (unknown [10.42.28.5])\n by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 364071956086; Thu, 21 Nov 2024 15:43:55 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1732203840;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=ShPcAkYpFIhe0//CqodvG2ShpbJoQ+YDIDMHBDSOIG0=;\n b=VhvPX5RnrQoTKrw0B+htCx48gqof/CAdeN5kIUWZ3w4XtFB7O+toEGbJS5X22X78tpHcZ4\n MVpZl06QMjdQ4CEOyf9wfobE9TFB9Foi1Ecnj7+RC7qZiVpwRgr6zFDvAJ276pI6VvZOFY\n /UWHo0BcNzV9kigD7AvO5xzr0wNDq1g=","X-MC-Unique":"dGVVZri8M3GeIJjEf8DOWQ-1","X-Mimecast-MFC-AGG-ID":"dGVVZri8M3GeIJjEf8DOWQ","From":"=?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= ","To":"qemu-devel@nongnu.org","Cc":"Thomas Huth , Ani Sinha ,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= ,\n Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?=\n\t=?utf-8?q?=C3=A9?= ,\n =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= ","Subject":"[PATCH v2 14/18] tests/functional: require non-NULL success_message\n for console wait","Date":"Thu, 21 Nov 2024 15:42:14 +0000","Message-ID":"<20241121154218.1423005-15-berrange@redhat.com>","In-Reply-To":"<20241121154218.1423005-1-berrange@redhat.com>","References":"<20241121154218.1423005-1-berrange@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.15","Received-SPF":"pass client-ip=170.10.133.124;\n envelope-from=berrange@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-21","X-Spam_score":"-2.2","X-Spam_bar":"--","X-Spam_report":"(-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.14,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"When waiting for expected output, the 'success_message' is a mandatory\nparameter, with 'failure_message' defaulting to None.\n\nThe code has logic which indicates it was trying to cope with\n'success_message' being None and 'failure_message' being non-None but\nit does not appear able to actually do anything useful. The check for\n'success_message is None' will break out of the loop before any check\nfor 'failure_message' has been performed.\n\nIOW, for practcal purposes 'success_message' must be non-None unless\n'send_string' is set. Assert this expectation and simplify the loop\nlogic.\n\nSigned-off-by: Daniel P. Berrangé \n---\n tests/functional/qemu_test/cmd.py | 9 +++++++--\n 1 file changed, 7 insertions(+), 2 deletions(-)","diff":"diff --git a/tests/functional/qemu_test/cmd.py b/tests/functional/qemu_test/cmd.py\nindex 98722a9cf6..f6c4e4dda1 100644\n--- a/tests/functional/qemu_test/cmd.py\n+++ b/tests/functional/qemu_test/cmd.py\n@@ -81,6 +81,8 @@ def is_readable_executable_file(path):\n def _console_interaction(test, success_message, failure_message,\n send_string, keep_sending=False, vm=None):\n assert not keep_sending or send_string\n+ assert success_message or send_string\n+\n if vm is None:\n vm = test.vm\n console = vm.console_file\n@@ -95,7 +97,7 @@ def _console_interaction(test, success_message, failure_message,\n send_string = None # send only once\n \n # Only consume console output if waiting for something\n- if success_message is None and failure_message is None:\n+ if success_message is None:\n if send_string is None:\n break\n continue\n@@ -107,7 +109,7 @@ def _console_interaction(test, success_message, failure_message,\n if not msg:\n continue\n console_logger.debug(msg)\n- if success_message is None or success_message in msg:\n+ if success_message in msg:\n break\n if failure_message and failure_message in msg:\n console.close()\n@@ -138,6 +140,7 @@ def interrupt_interactive_console_until_pattern(test, success_message,\n :param interrupt_string: a string to send to the console before trying\n to read a new line\n \"\"\"\n+ assert success_message\n _console_interaction(test, success_message, failure_message,\n interrupt_string, True)\n \n@@ -152,6 +155,7 @@ def wait_for_console_pattern(test, success_message, failure_message=None,\n :param success_message: if this message appears, test succeeds\n :param failure_message: if this message appears, test fails\n \"\"\"\n+ assert success_message\n _console_interaction(test, success_message, failure_message, None, vm=vm)\n \n def exec_command(test, command):\n@@ -180,6 +184,7 @@ def exec_command_and_wait_for_pattern(test, command,\n :param success_message: if this message appears, test succeeds\n :param failure_message: if this message appears, test fails\n \"\"\"\n+ assert success_message\n _console_interaction(test, success_message, failure_message, command + '\\r')\n \n def get_qemu_img(test):\n","prefixes":["v2","14/18"]}