* [PULL v2 00/46] Python queue 2020-02-07
@ 2020-02-07 15:11 Philippe Mathieu-Daudé
2020-02-07 15:11 ` [PULL v2 40/46] tests/qemu-iotests: Explicit usage of Python3 (scripts without __main__) Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-07 15:11 UTC (permalink / raw)
To: qemu-devel
Cc: Vladimir Sementsov-Ogievskiy, Eduardo Habkost, qemu-block,
Max Reitz, Cleber Rosa, Philippe Mathieu-Daudé
Hi Peter,
I prepared this series on behalf of Eduardo and
Cleber.
Eduardo already ack'ed yesterday version (2020-02-06) cover:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg677636.html
Since 2020-02-06 (v1):
- rebased to cover new iotests #283 (merged yesterday).
Regards,
Phil.
The following changes since commit 863d2ed5823f90c42dcd481687cc99cbc9c4a17c:
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-02-06' into staging (2020-02-06 16:22:05 +0000)
are available in the Git repository at:
https://gitlab.com/philmd/qemu.git tags/python-next-20200207
for you to fetch changes up to 66e7dde18cc4085ca47124be4ca08fa8e6bcdd3a:
.readthedocs.yml: specify some minimum python requirements (2020-02-07 15:15:16 +0100)
----------------------------------------------------------------
- Python 3 cleanups:
. Remove text about Python 2 in qemu-deprecated (Thomas)
. Remove shebang header (Paolo, Philippe)
. scripts/checkpatch.pl now allows Python 3 interpreter (Philippe)
. Explicit usage of Python 3 interpreter in scripts (Philippe)
. Fix Python scripts permissions (Paolo, Philippe)
. Drop 'from __future__ import print_function' (Paolo)
. Specify minimum python requirements in ReadTheDocs configuration (Alex)
- Test UNIX/EXEC transports with migration (Oksana)
- Added extract_from_rpm helper, improved extract_from_deb (Liam)
- Allow to use other serial consoles than default one (Philippe)
- Various improvements in QEMUMonitorProtocol (Wainer)
- Fix kvm_available() on ppc64le (Wainer)
----------------------------------------------------------------
Alex Bennée (1):
.readthedocs.yml: specify some minimum python requirements
Denis Plotnikov (1):
tests: rename virtio_seg_max_adjust to virtio_check_params
Liam Merwick (4):
travis.yml: install rpm2cpio for acceptance tests
tests/boot_linux_console: add extract_from_rpm method
tests/boot_linux_console: use os.path for filesystem paths
tests/boot_linux_console: fix extract_from_deb() comment
Lukáš Doktor (1):
python: Treat None-return of greeting cmd
Oksana Vohchana (4):
tests/acceptance/migration: Factor out assert_migration()
tests/acceptance/migration: Factor out do_migrate()
tests/acceptance/migration: Test UNIX transport when migrating
tests/acceptance/migration: Test EXEC transport when migrating
Paolo Bonzini (3):
scripts/signrom: remove Python 2 support, add shebang
make all Python scripts executable
drop "from __future__ import print_function"
Philippe Mathieu-Daudé (24):
python/qemu/machine: Allow to use other serial consoles than default
Acceptance tests: Extract _console_interaction()
Acceptance tests: Add interrupt_interactive_console_until_pattern()
tests/boot_linux_console: Tag Emcraft Smartfusion2 as running 'u-boot'
tests/acceptance/virtio_check_params: Improve exception logging
tests/acceptance/virtio_check_params: List machine being tested
tests/acceptance/virtio_check_params: Default to -nodefaults
tests/acceptance/virtio_check_params: Disable the test
tests/acceptance/boot_linux_console: Do not use VGA on Clipper machine
tests/acceptance/version: Default to -nodefaults
tests/acceptance/migration: Add the 'migration' tag
tests/acceptance/migration: Default to -nodefaults
scripts/checkpatch.pl: Only allow Python 3 interpreter
tests/qemu-iotests/check: Allow use of python3 interpreter
tests/qemu-iotests: Explicit usage of Python 3 (scripts with __main__)
tests: Explicit usage of Python 3
scripts: Explicit usage of Python 3 (scripts with __main__)
scripts/minikconf: Explicit usage of Python 3
scripts/tracetool: Remove shebang header
tests/acceptance: Remove shebang header
tests/vm: Remove shebang header
tests/qemu-iotests: Explicit usage of Python3 (scripts without
__main__)
scripts: Explicit usage of Python 3 (scripts without __main__)
tests/qemu-iotests/check: Only check for Python 3 interpreter
Thomas Huth (2):
qemu-deprecated: Remove text about Python 2
tests/acceptance: Add boot tests for some of the QEMU advent calendar
images
Wainer dos Santos Moschetta (6):
python/qemu: qmp: Replace socket.error with OSError
python/qemu: Delint the qmp module
python/qemu: qmp: Make accept()'s timeout configurable
python/qemu: qmp: Make QEMUMonitorProtocol a context manager
python/qemu: qmp: Remove unnused attributes
python/qemu: accel: Fix kvm_available() on ppc64le
qemu-deprecated.texi | 8 --
.readthedocs.yml | 20 +++
.travis.yml | 3 +-
python/qemu/accel.py | 3 +-
python/qemu/machine.py | 10 +-
python/qemu/qmp.py | 99 ++++++++++----
scripts/analyse-9p-simpletrace.py | 3 +-
scripts/analyse-locks-simpletrace.py | 3 +-
scripts/checkpatch.pl | 6 +
scripts/decodetree.py | 2 +-
scripts/device-crash-test | 3 +-
scripts/dump-guest-memory.py | 1 -
scripts/kvm/kvm_flightrecorder | 3 +-
scripts/kvm/vmxcap | 1 -
scripts/minikconf.py | 2 +-
scripts/modules/module_block.py | 1 -
scripts/qapi-gen.py | 3 +-
scripts/qapi/doc.py | 1 -
scripts/qmp/qemu-ga-client | 3 +-
scripts/qmp/qmp | 3 +-
scripts/qmp/qmp-shell | 3 +-
scripts/qmp/qom-fuse | 2 +-
scripts/qmp/qom-get | 1 -
scripts/qmp/qom-list | 1 -
scripts/qmp/qom-set | 1 -
scripts/qmp/qom-tree | 1 -
scripts/render_block_graph.py | 2 +-
scripts/replay-dump.py | 3 +-
scripts/signrom.py | 11 +-
scripts/simpletrace.py | 3 +-
scripts/tracetool.py | 2 +-
scripts/tracetool/__init__.py | 1 -
scripts/tracetool/backend/__init__.py | 1 -
scripts/tracetool/backend/dtrace.py | 1 -
scripts/tracetool/backend/ftrace.py | 1 -
scripts/tracetool/backend/log.py | 1 -
scripts/tracetool/backend/simple.py | 1 -
scripts/tracetool/backend/syslog.py | 1 -
scripts/tracetool/backend/ust.py | 1 -
scripts/tracetool/format/__init__.py | 1 -
scripts/tracetool/format/c.py | 1 -
scripts/tracetool/format/d.py | 1 -
scripts/tracetool/format/h.py | 1 -
scripts/tracetool/format/log_stap.py | 1 -
scripts/tracetool/format/simpletrace_stap.py | 1 -
scripts/tracetool/format/stap.py | 1 -
scripts/tracetool/format/tcg_h.py | 1 -
scripts/tracetool/format/tcg_helper_c.py | 1 -
scripts/tracetool/format/tcg_helper_h.py | 1 -
.../tracetool/format/tcg_helper_wrapper_h.py | 1 -
scripts/tracetool/format/ust_events_c.py | 1 -
scripts/tracetool/format/ust_events_h.py | 1 -
scripts/tracetool/transform.py | 1 -
scripts/tracetool/vcpu.py | 1 -
scripts/vmstate-static-checker.py | 3 +-
tests/acceptance/avocado_qemu/__init__.py | 59 +++++++--
tests/acceptance/boot_linux_console.py | 124 +++++++++++++++++-
tests/acceptance/migration.py | 57 +++++---
tests/acceptance/version.py | 1 +
...g_max_adjust.py => virtio_check_params.py} | 16 ++-
tests/acceptance/x86_cpu_model_versions.py | 1 -
tests/docker/travis.py | 3 +-
tests/guest-debug/test-gdbstub.py | 1 -
tests/migration/guestperf/engine.py | 1 -
tests/migration/guestperf/plot.py | 1 -
tests/migration/guestperf/shell.py | 1 -
tests/qapi-schema/test-qapi.py | 3 +-
tests/qemu-iotests/030 | 2 +-
tests/qemu-iotests/040 | 2 +-
tests/qemu-iotests/041 | 2 +-
tests/qemu-iotests/044 | 2 +-
tests/qemu-iotests/045 | 2 +-
tests/qemu-iotests/055 | 2 +-
tests/qemu-iotests/056 | 2 +-
tests/qemu-iotests/057 | 2 +-
tests/qemu-iotests/065 | 2 +-
tests/qemu-iotests/093 | 2 +-
tests/qemu-iotests/096 | 2 +-
tests/qemu-iotests/118 | 2 +-
tests/qemu-iotests/124 | 2 +-
tests/qemu-iotests/129 | 2 +-
tests/qemu-iotests/132 | 2 +-
tests/qemu-iotests/136 | 2 +-
tests/qemu-iotests/139 | 2 +-
tests/qemu-iotests/147 | 2 +-
tests/qemu-iotests/148 | 2 +-
tests/qemu-iotests/149 | 3 +-
tests/qemu-iotests/151 | 2 +-
tests/qemu-iotests/152 | 2 +-
tests/qemu-iotests/155 | 2 +-
tests/qemu-iotests/163 | 2 +-
tests/qemu-iotests/165 | 3 +-
tests/qemu-iotests/169 | 2 +-
tests/qemu-iotests/194 | 2 +-
tests/qemu-iotests/196 | 2 +-
tests/qemu-iotests/199 | 2 +-
tests/qemu-iotests/202 | 2 +-
tests/qemu-iotests/203 | 2 +-
tests/qemu-iotests/205 | 2 +-
tests/qemu-iotests/206 | 2 +-
tests/qemu-iotests/207 | 2 +-
tests/qemu-iotests/208 | 2 +-
tests/qemu-iotests/209 | 2 +-
tests/qemu-iotests/210 | 2 +-
tests/qemu-iotests/211 | 2 +-
tests/qemu-iotests/212 | 2 +-
tests/qemu-iotests/213 | 2 +-
tests/qemu-iotests/216 | 2 +-
tests/qemu-iotests/218 | 2 +-
tests/qemu-iotests/219 | 2 +-
tests/qemu-iotests/222 | 2 +-
tests/qemu-iotests/224 | 2 +-
tests/qemu-iotests/228 | 2 +-
tests/qemu-iotests/234 | 2 +-
tests/qemu-iotests/235 | 2 +-
tests/qemu-iotests/236 | 2 +-
tests/qemu-iotests/237 | 2 +-
tests/qemu-iotests/238 | 2 +-
tests/qemu-iotests/242 | 2 +-
tests/qemu-iotests/245 | 2 +-
tests/qemu-iotests/246 | 2 +-
tests/qemu-iotests/248 | 2 +-
tests/qemu-iotests/254 | 2 +-
tests/qemu-iotests/255 | 2 +-
tests/qemu-iotests/256 | 2 +-
tests/qemu-iotests/257 | 2 +-
tests/qemu-iotests/258 | 2 +-
tests/qemu-iotests/260 | 2 +-
tests/qemu-iotests/262 | 2 +-
tests/qemu-iotests/264 | 2 +-
tests/qemu-iotests/266 | 2 +-
tests/qemu-iotests/277 | 2 +-
tests/qemu-iotests/280 | 2 +-
tests/qemu-iotests/281 | 2 +-
tests/qemu-iotests/283 | 2 +-
tests/qemu-iotests/check | 2 +-
tests/qemu-iotests/iotests.py | 1 -
tests/qemu-iotests/nbd-fault-injector.py | 3 +-
tests/qemu-iotests/qcow2.py | 3 +-
tests/qemu-iotests/qed.py | 3 +-
tests/vm/basevm.py | 2 -
tests/vm/centos | 2 +-
tests/vm/fedora | 2 +-
tests/vm/freebsd | 2 +-
tests/vm/netbsd | 2 +-
tests/vm/openbsd | 2 +-
tests/vm/ubuntu.i386 | 2 +-
147 files changed, 432 insertions(+), 234 deletions(-)
create mode 100644 .readthedocs.yml
mode change 100644 => 100755 scripts/minikconf.py
mode change 100644 => 100755 scripts/signrom.py
rename tests/acceptance/{virtio_seg_max_adjust.py => virtio_check_params.py} (90%)
mode change 100755 => 100644
mode change 100644 => 100755 tests/qemu-iotests/222
mode change 100644 => 100755 tests/qemu-iotests/245
mode change 100755 => 100644 tests/vm/basevm.py
--
2.21.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PULL v2 40/46] tests/qemu-iotests: Explicit usage of Python3 (scripts without __main__)
2020-02-07 15:11 [PULL v2 00/46] Python queue 2020-02-07 Philippe Mathieu-Daudé
@ 2020-02-07 15:11 ` Philippe Mathieu-Daudé
2020-02-07 16:51 ` [PULL v2 00/46] Python queue 2020-02-07 Eduardo Habkost
2020-02-10 16:07 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-07 15:11 UTC (permalink / raw)
To: qemu-devel
Cc: Vladimir Sementsov-Ogievskiy, Daniel P . Berrangé,
Eduardo Habkost, qemu-block, Max Reitz, Stefan Hajnoczi,
Cleber Rosa, Paolo Bonzini, Philippe Mathieu-Daudé
Use the program search path to find the Python 3 interpreter.
Patch created mechanically by running:
$ sed -i "s,^#\!/usr/bin/\(env\ \)\?python$,#\!/usr/bin/env python3," \
$(git grep -lF '#!/usr/bin/env python' \
| xargs grep -L 'if __name__.*__main__')
Reported-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200130163232.10446-11-philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2: Rebased to include tests/qemu-iotests/283
tests/qemu-iotests/149 | 2 +-
tests/qemu-iotests/194 | 2 +-
tests/qemu-iotests/202 | 2 +-
tests/qemu-iotests/203 | 2 +-
tests/qemu-iotests/206 | 2 +-
tests/qemu-iotests/207 | 2 +-
tests/qemu-iotests/208 | 2 +-
tests/qemu-iotests/209 | 2 +-
tests/qemu-iotests/210 | 2 +-
tests/qemu-iotests/211 | 2 +-
tests/qemu-iotests/212 | 2 +-
tests/qemu-iotests/213 | 2 +-
tests/qemu-iotests/216 | 2 +-
tests/qemu-iotests/218 | 2 +-
tests/qemu-iotests/219 | 2 +-
tests/qemu-iotests/222 | 2 +-
tests/qemu-iotests/224 | 2 +-
tests/qemu-iotests/228 | 2 +-
tests/qemu-iotests/234 | 2 +-
tests/qemu-iotests/235 | 2 +-
tests/qemu-iotests/236 | 2 +-
tests/qemu-iotests/237 | 2 +-
tests/qemu-iotests/238 | 2 +-
tests/qemu-iotests/242 | 2 +-
tests/qemu-iotests/246 | 2 +-
tests/qemu-iotests/248 | 2 +-
tests/qemu-iotests/254 | 2 +-
tests/qemu-iotests/255 | 2 +-
tests/qemu-iotests/256 | 2 +-
tests/qemu-iotests/260 | 2 +-
tests/qemu-iotests/262 | 2 +-
tests/qemu-iotests/264 | 2 +-
tests/qemu-iotests/266 | 2 +-
tests/qemu-iotests/277 | 2 +-
tests/qemu-iotests/280 | 2 +-
tests/qemu-iotests/283 | 2 +-
36 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
index 8ab42e94c6..0a7b765d07 100755
--- a/tests/qemu-iotests/149
+++ b/tests/qemu-iotests/149
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2016 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194
index 72e47e8833..9dc1bd3510 100755
--- a/tests/qemu-iotests/194
+++ b/tests/qemu-iotests/194
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2017 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/202 b/tests/qemu-iotests/202
index 581ca34d79..920a8683ef 100755
--- a/tests/qemu-iotests/202
+++ b/tests/qemu-iotests/202
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2017 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/203 b/tests/qemu-iotests/203
index 4874a1a0d8..49eff5d405 100755
--- a/tests/qemu-iotests/203
+++ b/tests/qemu-iotests/203
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2017 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206
index 9f16a7df8d..e2b50ae24d 100755
--- a/tests/qemu-iotests/206
+++ b/tests/qemu-iotests/206
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test qcow2 and file image creation
#
diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207
index 812ab34e47..3d9c1208ca 100755
--- a/tests/qemu-iotests/207
+++ b/tests/qemu-iotests/207
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test ssh image creation
#
diff --git a/tests/qemu-iotests/208 b/tests/qemu-iotests/208
index 546eb1de3e..1c3fc8c7fd 100755
--- a/tests/qemu-iotests/208
+++ b/tests/qemu-iotests/208
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2018 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209
index e0f464bcbe..65c1a1e70a 100755
--- a/tests/qemu-iotests/209
+++ b/tests/qemu-iotests/209
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Tests for NBD BLOCK_STATUS extension
#
diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210
index 4ca0fe26ef..e49896e23d 100755
--- a/tests/qemu-iotests/210
+++ b/tests/qemu-iotests/210
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test luks and file image creation
#
diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211
index 8834ebfe85..163994d559 100755
--- a/tests/qemu-iotests/211
+++ b/tests/qemu-iotests/211
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test VDI and file image creation
#
diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212
index 8f3ccc7b15..800f92dd84 100755
--- a/tests/qemu-iotests/212
+++ b/tests/qemu-iotests/212
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test parallels and file image creation
#
diff --git a/tests/qemu-iotests/213 b/tests/qemu-iotests/213
index 3fc8dc6eaa..1eee45276a 100755
--- a/tests/qemu-iotests/213
+++ b/tests/qemu-iotests/213
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test vhdx and file image creation
#
diff --git a/tests/qemu-iotests/216 b/tests/qemu-iotests/216
index 3c0ae54b44..372f042d3e 100755
--- a/tests/qemu-iotests/216
+++ b/tests/qemu-iotests/216
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copy-on-read tests using a COR filter node
#
diff --git a/tests/qemu-iotests/218 b/tests/qemu-iotests/218
index 2554d84581..1325ba9eaa 100755
--- a/tests/qemu-iotests/218
+++ b/tests/qemu-iotests/218
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This test covers what happens when a mirror block job is cancelled
# in various phases of its existence.
diff --git a/tests/qemu-iotests/219 b/tests/qemu-iotests/219
index 655f54d881..b8774770c4 100755
--- a/tests/qemu-iotests/219
+++ b/tests/qemu-iotests/219
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2018 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222
index 3f9f934ad8..bf1718e179 100644
--- a/tests/qemu-iotests/222
+++ b/tests/qemu-iotests/222
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This test covers the basic fleecing workflow, which provides a
# point-in-time snapshot of a node that can be queried over NBD.
diff --git a/tests/qemu-iotests/224 b/tests/qemu-iotests/224
index b4dfaa639f..e91fb26fd8 100755
--- a/tests/qemu-iotests/224
+++ b/tests/qemu-iotests/224
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test json:{} filenames with qemu-internal BDSs
# (the one of commit, to be precise)
diff --git a/tests/qemu-iotests/228 b/tests/qemu-iotests/228
index 9a50afd205..64bc82ee23 100755
--- a/tests/qemu-iotests/228
+++ b/tests/qemu-iotests/228
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test for when a backing file is considered overridden (thus, a
# json:{} filename is generated for the overlay) and when it is not
diff --git a/tests/qemu-iotests/234 b/tests/qemu-iotests/234
index 59a7f949ec..324c1549fd 100755
--- a/tests/qemu-iotests/234
+++ b/tests/qemu-iotests/234
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2018 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
index 3d7533980d..760826128e 100755
--- a/tests/qemu-iotests/235
+++ b/tests/qemu-iotests/235
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Simple mirror test
#
diff --git a/tests/qemu-iotests/236 b/tests/qemu-iotests/236
index 79a6381f8e..8ce927a16c 100755
--- a/tests/qemu-iotests/236
+++ b/tests/qemu-iotests/236
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test bitmap merges.
#
diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237
index a2242a4736..50ba364a3e 100755
--- a/tests/qemu-iotests/237
+++ b/tests/qemu-iotests/237
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test vmdk and file image creation
#
diff --git a/tests/qemu-iotests/238 b/tests/qemu-iotests/238
index e5ac2b2ff8..d4e060228c 100755
--- a/tests/qemu-iotests/238
+++ b/tests/qemu-iotests/238
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Regression test for throttle group member unregister segfault with iothread
#
diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242
index c176e92da6..97617876bc 100755
--- a/tests/qemu-iotests/242
+++ b/tests/qemu-iotests/242
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test for qcow2 bitmap printed information
#
diff --git a/tests/qemu-iotests/246 b/tests/qemu-iotests/246
index b0997a392f..59a216a839 100755
--- a/tests/qemu-iotests/246
+++ b/tests/qemu-iotests/246
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test persistent bitmap resizing.
#
diff --git a/tests/qemu-iotests/248 b/tests/qemu-iotests/248
index f26b4bb2aa..68c374692e 100755
--- a/tests/qemu-iotests/248
+++ b/tests/qemu-iotests/248
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test resume mirror after auto pause on ENOSPC
#
diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254
index 09584f3f7d..ee66c986db 100755
--- a/tests/qemu-iotests/254
+++ b/tests/qemu-iotests/254
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test external snapshot with bitmap copying and moving.
#
diff --git a/tests/qemu-iotests/255 b/tests/qemu-iotests/255
index 0ba03d9e61..4a4818bafb 100755
--- a/tests/qemu-iotests/255
+++ b/tests/qemu-iotests/255
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test commit job graph modifications while requests are active
#
diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256
index c594a43205..e34074c83e 100755
--- a/tests/qemu-iotests/256
+++ b/tests/qemu-iotests/256
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test incremental/backup across iothread contexts
#
diff --git a/tests/qemu-iotests/260 b/tests/qemu-iotests/260
index 4f6082c9d2..30c0de380d 100755
--- a/tests/qemu-iotests/260
+++ b/tests/qemu-iotests/260
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Tests for temporary external snapshot when we have bitmaps.
#
diff --git a/tests/qemu-iotests/262 b/tests/qemu-iotests/262
index bbcb5260a6..8835dce7be 100755
--- a/tests/qemu-iotests/262
+++ b/tests/qemu-iotests/262
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2019 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264
index 131366422b..879123a343 100755
--- a/tests/qemu-iotests/264
+++ b/tests/qemu-iotests/264
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test nbd reconnect
#
diff --git a/tests/qemu-iotests/266 b/tests/qemu-iotests/266
index c353cf88ee..91bdf8729e 100755
--- a/tests/qemu-iotests/266
+++ b/tests/qemu-iotests/266
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test VPC and file image creation
#
diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277
index 1f72dca2d4..04aa15a3d5 100755
--- a/tests/qemu-iotests/277
+++ b/tests/qemu-iotests/277
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test NBD client reconnection
#
diff --git a/tests/qemu-iotests/280 b/tests/qemu-iotests/280
index 85e9114c5e..69288fdd0e 100755
--- a/tests/qemu-iotests/280
+++ b/tests/qemu-iotests/280
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2019 Red Hat, Inc.
#
diff --git a/tests/qemu-iotests/283 b/tests/qemu-iotests/283
index 293e557bd9..55b7cff953 100644
--- a/tests/qemu-iotests/283
+++ b/tests/qemu-iotests/283
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Test for backup-top filter permission activation failure
#
--
2.21.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PULL v2 00/46] Python queue 2020-02-07
2020-02-07 15:11 [PULL v2 00/46] Python queue 2020-02-07 Philippe Mathieu-Daudé
2020-02-07 15:11 ` [PULL v2 40/46] tests/qemu-iotests: Explicit usage of Python3 (scripts without __main__) Philippe Mathieu-Daudé
@ 2020-02-07 16:51 ` Eduardo Habkost
2020-02-10 16:07 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Eduardo Habkost @ 2020-02-07 16:51 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Cleber Rosa, Vladimir Sementsov-Ogievskiy, qemu-devel,
qemu-block, Max Reitz
[-- Attachment #1: Type: text/plain, Size: 984 bytes --]
On Fri, Feb 07, 2020 at 04:11:12PM +0100, Philippe Mathieu-Daudé wrote:
> Hi Peter,
>
> I prepared this series on behalf of Eduardo and
> Cleber.
>
> Eduardo already ack'ed yesterday version (2020-02-06) cover:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg677636.html
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
>
> Since 2020-02-06 (v1):
> - rebased to cover new iotests #283 (merged yesterday).
>
> Regards,
>
> Phil.
>
> The following changes since commit 863d2ed5823f90c42dcd481687cc99cbc9c4a17c:
>
> Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-02-06' into staging (2020-02-06 16:22:05 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/philmd/qemu.git tags/python-next-20200207
>
> for you to fetch changes up to 66e7dde18cc4085ca47124be4ca08fa8e6bcdd3a:
>
> .readthedocs.yml: specify some minimum python requirements (2020-02-07 15:15:16 +0100)
>
--
Eduardo
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PULL v2 00/46] Python queue 2020-02-07
2020-02-07 15:11 [PULL v2 00/46] Python queue 2020-02-07 Philippe Mathieu-Daudé
2020-02-07 15:11 ` [PULL v2 40/46] tests/qemu-iotests: Explicit usage of Python3 (scripts without __main__) Philippe Mathieu-Daudé
2020-02-07 16:51 ` [PULL v2 00/46] Python queue 2020-02-07 Eduardo Habkost
@ 2020-02-10 16:07 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2020-02-10 16:07 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Vladimir Sementsov-Ogievskiy, Eduardo Habkost, Qemu-block,
QEMU Developers, Max Reitz, Cleber Rosa
On Fri, 7 Feb 2020 at 15:14, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Hi Peter,
>
> I prepared this series on behalf of Eduardo and
> Cleber.
>
> Eduardo already ack'ed yesterday version (2020-02-06) cover:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg677636.html
>
> Since 2020-02-06 (v1):
> - rebased to cover new iotests #283 (merged yesterday).
>
> Regards,
>
> Phil.
>
> The following changes since commit 863d2ed5823f90c42dcd481687cc99cbc9c4a17c:
>
> Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-02-06' into staging (2020-02-06 16:22:05 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/philmd/qemu.git tags/python-next-20200207
>
> for you to fetch changes up to 66e7dde18cc4085ca47124be4ca08fa8e6bcdd3a:
>
> .readthedocs.yml: specify some minimum python requirements (2020-02-07 15:15:16 +0100)
>
> ----------------------------------------------------------------
> - Python 3 cleanups:
> . Remove text about Python 2 in qemu-deprecated (Thomas)
> . Remove shebang header (Paolo, Philippe)
> . scripts/checkpatch.pl now allows Python 3 interpreter (Philippe)
> . Explicit usage of Python 3 interpreter in scripts (Philippe)
> . Fix Python scripts permissions (Paolo, Philippe)
> . Drop 'from __future__ import print_function' (Paolo)
> . Specify minimum python requirements in ReadTheDocs configuration (Alex)
> - Test UNIX/EXEC transports with migration (Oksana)
> - Added extract_from_rpm helper, improved extract_from_deb (Liam)
> - Allow to use other serial consoles than default one (Philippe)
> - Various improvements in QEMUMonitorProtocol (Wainer)
> - Fix kvm_available() on ppc64le (Wainer)
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-10 16:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-07 15:11 [PULL v2 00/46] Python queue 2020-02-07 Philippe Mathieu-Daudé
2020-02-07 15:11 ` [PULL v2 40/46] tests/qemu-iotests: Explicit usage of Python3 (scripts without __main__) Philippe Mathieu-Daudé
2020-02-07 16:51 ` [PULL v2 00/46] Python queue 2020-02-07 Eduardo Habkost
2020-02-10 16:07 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.