tests/qemu-iotests/testrunner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
We should drop final '\n' before comparing with python3 shebang.
Fixes: d74c754c924ca34e90b7c96ce2f5609d82c0e628
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.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
On 29/01/2021 10.06, Vladimir Sementsov-Ogievskiy wrote: > We should drop final '\n' before comparing with python3 shebang. > > Fixes: d74c754c924ca34e90b7c96ce2f5609d82c0e628 > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.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 Together with your other patch, this fixes "make vm-build-netbsd" for me, thanks! Tested-by: Thomas Huth <thuth@redhat.com>
On 1/29/21 4:06 AM, Vladimir Sementsov-Ogievskiy wrote: > We should drop final '\n' before comparing with python3 shebang. > > Fixes: d74c754c924ca34e90b7c96ce2f5609d82c0e628 > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: John Snow <jsnow@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 >
Am 29.01.2021 um 10:06 hat Vladimir Sementsov-Ogievskiy geschrieben: > We should drop final '\n' before comparing with python3 shebang. > > Fixes: d74c754c924ca34e90b7c96ce2f5609d82c0e628 > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Thanks, applied to the block branch. Kevin
© 2016 - 2024 Red Hat, Inc.