From nobody Mon May 6 17:12:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1642464670718112.23475168337382; Mon, 17 Jan 2022 16:11:10 -0800 (PST) Received: from localhost ([::1]:40164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9c5d-0003pr-Dc for importer@patchew.org; Mon, 17 Jan 2022 19:11:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9bvf-0001EH-K8 for qemu-devel@nongnu.org; Mon, 17 Jan 2022 19:00:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:50583) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9bvc-00027o-MX for qemu-devel@nongnu.org; Mon, 17 Jan 2022 19:00:50 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-520-ANDOotNgO0q-5d4x049xJQ-1; Mon, 17 Jan 2022 19:00:40 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FB2E1083F67; Tue, 18 Jan 2022 00:00:39 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.19.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 577CD65714; Tue, 18 Jan 2022 00:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642464043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bU7q3hfL9crGkc1gjBTLbGF+FYGtHblRLHgIzlMwFZ4=; b=EJFF82Q01vBlJc5EmJkai7v1ncoktEDLPE+tUEMZj8pENuy0Fm7f++3nZVLyAqtEWERstg ZTuzNgG9GVvZQKUWGpc7TD3ZwHRnRfo27XL/7Y0WSeSjNZLWfho5e9sNdKGaZ/II34mtSW pAj4scQ29d1nM5z7SB2fpG/cyj4ZUeA= X-MC-Unique: ANDOotNgO0q-5d4x049xJQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 1/2] python/aqmp: Fix negotiation with pre-"oob" QEMU Date: Mon, 17 Jan 2022 19:00:29 -0500 Message-Id: <20220118000030.2978928-2-jsnow@redhat.com> In-Reply-To: <20220118000030.2978928-1-jsnow@redhat.com> References: <20220118000030.2978928-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Peter Maydell , Beraldo Leal , Markus Armbruster , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1642464672333100001 Content-Type: text/plain; charset="utf-8" QEMU versions prior to the "oob" capability *also* can't accept the "enable" keyword argument at all. Fix the handshake process with older QEMU versions. Signed-off-by: John Snow --- python/qemu/aqmp/qmp_client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/qemu/aqmp/qmp_client.py b/python/qemu/aqmp/qmp_client.py index 8105e29fa8..6b43e1dbbe 100644 --- a/python/qemu/aqmp/qmp_client.py +++ b/python/qemu/aqmp/qmp_client.py @@ -292,9 +292,9 @@ async def _negotiate(self) -> None: """ self.logger.debug("Negotiating capabilities ...") =20 - arguments: Dict[str, List[str]] =3D {'enable': []} + arguments: Dict[str, List[str]] =3D {} if self._greeting and 'oob' in self._greeting.QMP.capabilities: - arguments['enable'].append('oob') + arguments.setdefault('enable', []).append('oob') msg =3D self.make_execute_msg('qmp_capabilities', arguments=3Dargu= ments) =20 # It's not safe to use execute() here, because the reader/writers --=20 2.31.1 From nobody Mon May 6 17:12:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1642464784566885.76788872485; Mon, 17 Jan 2022 16:13:04 -0800 (PST) Received: from localhost ([::1]:44116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9c7T-0006Yr-JA for importer@patchew.org; Mon, 17 Jan 2022 19:13:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9bvg-0001Jk-P4 for qemu-devel@nongnu.org; Mon, 17 Jan 2022 19:00:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9bvc-00027s-Mq for qemu-devel@nongnu.org; Mon, 17 Jan 2022 19:00:51 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-346-o9HSGCplNl6bl27WcelSkw-1; Mon, 17 Jan 2022 19:00:41 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 634FB802924; Tue, 18 Jan 2022 00:00:40 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.19.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7193165718; Tue, 18 Jan 2022 00:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642464043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ejk3Q+lty02bdm4Jmcx1ftZGjTXc3rm/+kGTJzyhbXQ=; b=XCZq/A+X7isFptoKmYzmmDyu5wEBTkl6yk42I5Min3IoiJXzSqmV9kQwoMi0LB/P7Sb7wC xjQAQM5wZg49bLivLQ2sxiehng5ytMny108pLRf4u1ao6gbAPw64IUuLjAclIIZ1KCxjqR Huz6twIwiXYgqaEjd+SzsfheFhPqE14= X-MC-Unique: o9HSGCplNl6bl27WcelSkw-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 2/2] python: use avocado's "new" runner Date: Mon, 17 Jan 2022 19:00:30 -0500 Message-Id: <20220118000030.2978928-3-jsnow@redhat.com> In-Reply-To: <20220118000030.2978928-1-jsnow@redhat.com> References: <20220118000030.2978928-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Peter Maydell , Beraldo Leal , Markus Armbruster , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1642465685810100001 Content-Type: text/plain; charset="utf-8" The old legacy runner no longer seems to work with output logging, so we can't see failure logs when a test case fails. The new runner doesn't (seem to) support Coverage.py yet, but seeing error output is a more important feature. Signed-off-by: John Snow --- python/avocado.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/avocado.cfg b/python/avocado.cfg index c7722e7ecd..a460420059 100644 --- a/python/avocado.cfg +++ b/python/avocado.cfg @@ -1,5 +1,5 @@ [run] -test_runner =3D runner +test_runner =3D nrunner =20 [simpletests] # Don't show stdout/stderr in the test *summary* --=20 2.31.1