From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, John Snow <jsnow@redhat.com>
Subject: [PULL v2 25/25] tests/qapi-schema: Make test-qapi.py -u work when files are absent
Date: Mon, 27 Sep 2021 15:06:47 +0200 [thread overview]
Message-ID: <20210927130647.1271533-26-armbru@redhat.com> (raw)
In-Reply-To: <20210927130647.1271533-1-armbru@redhat.com>
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 <armbru@redhat.com>
Message-Id: <20210922125619.670673-3-armbru@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
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=%s\n%s' % (section.name, section.text))
+def open_test_result(dir_name, file_name, update):
+ mode = 'r+' if update else 'r'
+ try:
+ fp = open(os.path.join(dir_name, file_name), mode)
+ except FileNotFoundError:
+ if not update:
+ raise
+ fp = open(os.path.join(dir_name, file_name), 'w+')
+ return fp
+
+
def test_and_diff(test_name, dir_name, update):
sys.stdout = StringIO()
try:
@@ -148,10 +159,9 @@ def test_and_diff(test_name, dir_name, update):
sys.stdout.close()
sys.stdout = sys.__stdout__
- mode = 'r+' if update else 'r'
try:
- outfp = open(os.path.join(dir_name, test_name + '.out'), mode)
- errfp = open(os.path.join(dir_name, test_name + '.err'), mode)
+ outfp = open_test_result(dir_name, test_name + '.out', update)
+ errfp = open_test_result(dir_name, test_name + '.err', update)
expected_out = outfp.readlines()
expected_err = errfp.readlines()
except OSError as err:
--
2.31.1
next prev parent reply other threads:[~2021-09-27 13:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 13:06 [PULL v2 00/25] QAPI patches patches for 2021-09-25 Markus Armbruster
2021-09-27 13:06 ` [PULL v2 01/25] qapi: Tidy up unusual line breaks Markus Armbruster
2021-09-27 13:06 ` [PULL v2 02/25] qapi: Stop enforcing "type name should not end in 'Kind' Markus Armbruster
2021-09-27 13:06 ` [PULL v2 03/25] qapi: Convert simple union KeyValue to flat one Markus Armbruster
2021-09-27 13:06 ` [PULL v2 04/25] qapi: Convert simple union InputEvent " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 05/25] qapi: Convert simple union TpmTypeOptions " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 06/25] qapi: Convert simple union MemoryDeviceInfo " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 07/25] qapi: Convert simple union ChardevBackend " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 08/25] qapi: Convert simple union SocketAddressLegacy " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 09/25] qapi: Convert simple union ImageInfoSpecific " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 10/25] qapi: Convert simple union TransactionAction " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 11/25] tests/qapi-schema: Prepare for simple union UserDefListUnion removal Markus Armbruster
2021-09-27 13:06 ` [PULL v2 12/25] test-qobject-input-visitor: Wean off UserDefListUnion Markus Armbruster
2021-09-27 13:06 ` [PULL v2 13/25] test-qobject-output-visitor: " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 14/25] test-clone-visitor: " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 15/25] tests/qapi-schema: " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 16/25] tests/qapi-schema: Simple union UserDefListUnion is now unused, drop Markus Armbruster
2021-09-27 13:06 ` [PULL v2 17/25] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat Markus Armbruster
2021-09-27 13:06 ` [PULL v2 18/25] test-clone-visitor: Wean off __org.qemu_x-Union1 Markus Armbruster
2021-09-27 13:06 ` [PULL v2 19/25] tests/qapi-schema: Drop simple union __org.qemu_x-Union1 Markus Armbruster
2021-09-27 13:06 ` [PULL v2 20/25] tests/qapi-schema: Purge simple unions from tests Markus Armbruster
2021-09-27 13:06 ` [PULL v2 21/25] qapi: Drop simple unions Markus Armbruster
2021-09-27 13:06 ` [PULL v2 22/25] tests/qapi-schema: Rename flat-union-* test cases to union-* Markus Armbruster
2021-09-27 13:06 ` [PULL v2 23/25] test-clone-visitor: Correct an accidental rename Markus Armbruster
2021-09-27 13:06 ` [PULL v2 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError Markus Armbruster
2021-09-27 13:06 ` Markus Armbruster [this message]
2021-09-27 15:47 ` [PULL v2 00/25] QAPI patches patches for 2021-09-25 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210927130647.1271533-26-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).