From nobody Mon Feb 9 20:34:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632551791; cv=none; d=zohomail.com; s=zohoarc; b=kKe+rrrG/tntLkd3o+i2xjWotlfgUDL/E7KRFJnD6DLAkKWnrk5W3btkFpNq0IOIsW4uUpbN8wRwxofzWbvwTX9kZldR+FU2K09IjDIPv2EeDEeOdymtn7M1JSy37mqFR/qDvTE0dbZCIXdczC3vv0H1BYM0y6uEs4QykX3Zztk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632551791; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fjPpMnc58DLxC5DY4u0Ib6Ur9fvVvDsCHwZCAzUfZVo=; b=fOSdjXVyZWHMnJFESa305KZM6siCnK7QZ11owURIqSsy7HwT1cTnrfEzHWCdrB0FjSG5wVYVUyLk0ufKntwhwEb6GUS+kteLW851Uv+TwNWf78h8VcM1LEuYLDqaLyrV07Pxm8n9oWRb5TqgA2QNADoIF6mZkj1NKFsZRMVwArI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632551791392944.5545959874007; Fri, 24 Sep 2021 23:36:31 -0700 (PDT) Received: from localhost ([::1]:49958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mU1IU-0003d3-67 for importer@patchew.org; Sat, 25 Sep 2021 02:36:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mU189-0007g4-E3 for qemu-devel@nongnu.org; Sat, 25 Sep 2021 02:25:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51482) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mU183-0007Lj-5b for qemu-devel@nongnu.org; Sat, 25 Sep 2021 02:25:49 -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-30-VTY0_5I-NfGSljBM_JZ9jA-1; Sat, 25 Sep 2021 02:25:37 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB3BA802921; Sat, 25 Sep 2021 06:25:36 +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 6FB5119736; Sat, 25 Sep 2021 06:25:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6EE6D1135221; Sat, 25 Sep 2021 08:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632551140; 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=fjPpMnc58DLxC5DY4u0Ib6Ur9fvVvDsCHwZCAzUfZVo=; b=CmZ17oKUxnXTrDEyYcf93vsmJ0WlueJuw+ltiCxucxC1U1eywpXtdHYRh56XyKNLhg9tv8 oZzOn88VpXX50xt6yP7doHFcOodL6rnkIkOLWnCZ+zQxTng6ZYqhoKAwXtjYyE4I4MbHCX 45gqHDZW0lpHejmxbvzNksN8HXJCiyQ= X-MC-Unique: VTY0_5I-NfGSljBM_JZ9jA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 25/25] tests/qapi-schema: Make test-qapi.py -u work when files are absent Date: Sat, 25 Sep 2021 08:25:25 +0200 Message-Id: <20210925062525.988405-26-armbru@redhat.com> In-Reply-To: <20210925062525.988405-1-armbru@redhat.com> References: <20210925062525.988405-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.473, 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: peter.maydell@linaro.org, John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632551792080100001 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 Message-Id: <20210922125619.670673-3-armbru@redhat.com> 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