From nobody Sun Feb 8 23:37:14 2026 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 1632315584280713.9382692554273; Wed, 22 Sep 2021 05:59:44 -0700 (PDT) Received: from localhost ([::1]:56210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mT1qg-0003oG-Ui for importer@patchew.org; Wed, 22 Sep 2021 08:59:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT1nc-0002NW-3W for qemu-devel@nongnu.org; Wed, 22 Sep 2021 08:56:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29083) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT1nZ-0001KQ-3T for qemu-devel@nongnu.org; Wed, 22 Sep 2021 08:56:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-J1ZFU-H7NNm64nPxOz-L9g-1; Wed, 22 Sep 2021 08:56:22 -0400 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 8E61B18D6A2A; Wed, 22 Sep 2021 12:56:21 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-14.ams2.redhat.com [10.36.112.14]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B7AE60BF4; Wed, 22 Sep 2021 12:56:21 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DC269113861E; Wed, 22 Sep 2021 14:56:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315383; 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=RwLwE/eXUJjiQ8akFWRgN7NpWcVKHtD8YU9p5p/m+Oc=; b=QeB7nT3u26oNGyc0yvdoNYV1qH3VHlnXwujKFurEH1EHkNBMCA6tlddJ9JwY9NKRpc4i42 ohgSSJgSaFB+ZMriNdutB+d+0/lDMoo37BpRW+JdAkLNpaOjeHvt8P0KpnRPRJjhZeM9RL szCciwklskPrWt6Td3uXgDqO5/kxz+A= X-MC-Unique: J1ZFU-H7NNm64nPxOz-L9g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/2] tests/qapi-schema: Use Python OSError instead of outmoded IOError Date: Wed, 22 Sep 2021 14:56:18 +0200 Message-Id: <20210922125619.670673-2-armbru@redhat.com> In-Reply-To: <20210922125619.670673-1-armbru@redhat.com> References: <20210922125619.670673-1-armbru@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=armbru@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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.472, 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_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@gmail.com, jsnow@redhat.com, mdroth@linux.vnet.ibm.com 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: 1632315585751100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qapi-schema/test-qapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py index 73cffae2b6..2e384f5efd 100755 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -154,7 +154,7 @@ def test_and_diff(test_name, dir_name, update): errfp =3D open(os.path.join(dir_name, test_name + '.err'), mode) expected_out =3D outfp.readlines() expected_err =3D errfp.readlines() - except IOError as err: + except OSError as err: print("%s: can't open '%s': %s" % (sys.argv[0], err.filename, err.strerror), file=3Dsys.stderr) @@ -180,7 +180,7 @@ def test_and_diff(test_name, dir_name, update): errfp.truncate(0) errfp.seek(0) errfp.writelines(actual_err) - except IOError as err: + except OSError as err: print("%s: can't write '%s': %s" % (sys.argv[0], err.filename, err.strerror), file=3Dsys.stderr) --=20 2.31.1 From nobody Sun Feb 8 23:37:14 2026 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 1632315589871738.4782780800496; Wed, 22 Sep 2021 05:59:49 -0700 (PDT) Received: from localhost ([::1]:56216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mT1qm-0003oP-KS for importer@patchew.org; Wed, 22 Sep 2021 08:59:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT1nc-0002NV-39 for qemu-devel@nongnu.org; Wed, 22 Sep 2021 08:56:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT1nZ-0001Ll-1N for qemu-devel@nongnu.org; Wed, 22 Sep 2021 08:56:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-26-JfUtOJQQN2u35yr6BGqfXw-1; Wed, 22 Sep 2021 08:56:22 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8DB85801B3D; Wed, 22 Sep 2021 12:56:21 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-14.ams2.redhat.com [10.36.112.14]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B734652A1; Wed, 22 Sep 2021 12:56:21 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DF1FD11385C1; Wed, 22 Sep 2021 14:56:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315385; 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=6r/mOjtUtJ/HMMFiYJjK+zEkvBj9FJcn0cY4pCwwbxI=; b=POZvGkgIoh2jfDaXOcMrAZG6mJF4SZ4cjEaLmQtghZg17GDx2xIhDGIlCDeXGahUFQW0Tn 27c1gxMwKLXc/VsITtJvVPvd/7jNM/K7QqauNvWJ1WtObdyTEikEbMTDV0Vzu07+kmCY2a EknehgPQG4wongKVgA8nApTw9Derlew= X-MC-Unique: JfUtOJQQN2u35yr6BGqfXw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/2] tests/qapi-schema: Make test-qapi.py -u work when files are absent Date: Wed, 22 Sep 2021 14:56:19 +0200 Message-Id: <20210922125619.670673-3-armbru@redhat.com> In-Reply-To: <20210922125619.670673-1-armbru@redhat.com> References: <20210922125619.670673-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.472, 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_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@gmail.com, jsnow@redhat.com, mdroth@linux.vnet.ibm.com 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: 1632315590347100001 Content-Type: text/plain; charset="utf-8" test-qapi.py -u updates the expected files. Since it fails when they are absent, users have to create them manually before they can use test-qapi.py to fill in the contents, say for a new test. Silly. Improve -u to create them. Signed-off-by: Markus Armbruster Reviewed-by: John Snow --- tests/qapi-schema/test-qapi.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py index 2e384f5efd..c717a7a90b 100755 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -132,6 +132,17 @@ def test_frontend(fname): print(' section=3D%s\n%s' % (section.name, section.text)) =20 =20 +def open_test_result(dir_name, file_name, update): + mode =3D 'r+' if update else 'r' + try: + fp =3D open(os.path.join(dir_name, file_name), mode) + except FileNotFoundError: + if not update: + raise + fp =3D open(os.path.join(dir_name, file_name), 'w+') + return fp + + def test_and_diff(test_name, dir_name, update): sys.stdout =3D StringIO() try: @@ -148,10 +159,9 @@ def test_and_diff(test_name, dir_name, update): sys.stdout.close() sys.stdout =3D sys.__stdout__ =20 - mode =3D 'r+' if update else 'r' try: - outfp =3D open(os.path.join(dir_name, test_name + '.out'), mode) - errfp =3D open(os.path.join(dir_name, test_name + '.err'), mode) + outfp =3D open_test_result(dir_name, test_name + '.out', update) + errfp =3D open_test_result(dir_name, test_name + '.err', update) expected_out =3D outfp.readlines() expected_err =3D errfp.readlines() except OSError as err: --=20 2.31.1