From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 1/2] iotests/testrunner: fix recognition of python tests
Date: Fri, 29 Jan 2021 15:52:39 +0100 [thread overview]
Message-ID: <20210129145240.34104-2-kwolf@redhat.com> (raw)
In-Reply-To: <20210129145240.34104-1-kwolf@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
We should drop final '\n' before comparing with python3 shebang.
Fixes: d74c754c924ca34e90b7c96ce2f5609d82c0e628
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210129090616.84145-1-vsementsov@virtuozzo.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/testrunner.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.py
index a581be6a29..24b3fba115 100644
--- a/tests/qemu-iotests/testrunner.py
+++ b/tests/qemu-iotests/testrunner.py
@@ -248,7 +248,7 @@ class TestRunner(ContextManager['TestRunner']):
with f_test.open(encoding="utf-8") as f:
try:
- if f.readline() == '#!/usr/bin/env python3':
+ if f.readline().rstrip() == '#!/usr/bin/env python3':
args.insert(0, self.env.python)
except UnicodeDecodeError: # binary test? for future.
pass
--
2.29.2
next prev parent reply other threads:[~2021-01-29 14:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 14:52 [PULL 0/2] block: Fix iotests to respect configured Python binary Kevin Wolf
2021-01-29 14:52 ` Kevin Wolf [this message]
2021-01-29 14:52 ` [PULL 2/2] tests/Makefile.include: export PYTHON for check-block.sh Kevin Wolf
2021-01-29 16:13 ` [PULL 0/2] block: Fix iotests to respect configured Python binary Peter Maydell
2021-01-29 17:17 ` Kevin Wolf
2021-02-01 8:36 ` Vladimir Sementsov-Ogievskiy
2021-01-29 17:22 ` Peter Maydell
2021-02-01 21:43 ` Peter Maydell
2021-02-02 9:47 ` Peter Maydell
2021-02-02 11:41 ` Kevin Wolf
2021-02-02 12:43 ` Vladimir Sementsov-Ogievskiy
2021-02-02 13:44 ` 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=20210129145240.34104-2-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.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).