tests/qemu-iotests: Explicit usage of Python 3 (scripts with __main__)

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 -l 'if __name__.*__main__')

Reported-by: Vladimir Sementsov-Ogievskiy <[email protected]>
Suggested-by: Daniel P. Berrangé <[email protected]>
Suggested-by: Stefan Hajnoczi <[email protected]>
Acked-by: Stefan Hajnoczi <[email protected]>
Acked-by: Paolo Bonzini <[email protected]>
Message-Id: <20200130163232[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 0990681c1e4046d060ee6bb80584f762254aaa7c..aa911d266a13f33eba764d5409c8d015468e6fd1 100755 (executable)
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for image streaming.
 #

diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
index 74f62c3c4a2c1c106d6d043055fac5ae94d91fa5..2e7ee0e84fa803227d1c477b45c6b79e223075fc 100755 (executable)
--- a/tests/qemu-iotests/040
+++ b/tests/qemu-iotests/040
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for image block commit.
 #

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 0181f7a9b6bc048adc8c0da73d82b47014c8d8d2..43556b97273fc167d78d3760bf27149538258ee6 100755 (executable)
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for image mirroring.
 #

diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044
index 8b2afa2a11e946ecbf5e665ef762e48e18b43a58..7e99ea7c6849f05ecd0aeb06d4f4e8e372e1e693 100755 (executable)
--- a/tests/qemu-iotests/044
+++ b/tests/qemu-iotests/044
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests growing a large refcount table.
 #

diff --git a/tests/qemu-iotests/045 b/tests/qemu-iotests/045
index 01cc038884fa433874e204864ad1c91f8ccd8d4f..5acc89099c37afb081b0061a605a5d2887db1596 100755 (executable)
--- a/tests/qemu-iotests/045
+++ b/tests/qemu-iotests/045
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for fdsets and getfd.
 #

diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055
index c732a112d6670f4d011b656065b0bbccd9cd419a..82b9f5f47da7b37c7b0326f1e54f73e7f0406146 100755 (executable)
--- a/tests/qemu-iotests/055
+++ b/tests/qemu-iotests/055
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for drive-backup and blockdev-backup
 #

diff --git a/tests/qemu-iotests/056 b/tests/qemu-iotests/056
index f39287c162ebe1083f3d8d0144c26ef9c9bb25ce..f73fc74457df3fda93a01f8e5133f6535f69b67c 100755 (executable)
--- a/tests/qemu-iotests/056
+++ b/tests/qemu-iotests/056
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for drive-backup
 #

diff --git a/tests/qemu-iotests/057 b/tests/qemu-iotests/057
index 9fbba759b61a83d2b4bf8cc3ca0c43eaa1a97a4e..a8b4bb60e0d83f90a4c0fd9eb44243e53da55bf5 100755 (executable)
--- a/tests/qemu-iotests/057
+++ b/tests/qemu-iotests/057
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for internal snapshot.
 #

diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065
index 5b21eb96bd0975a351aea130ccc5573c06e17024..642647427118ed148301c747c39293a4ac2ea910 100755 (executable)
--- a/tests/qemu-iotests/065
+++ b/tests/qemu-iotests/065
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test for additional information emitted by qemu-img info on qcow2
 # images

diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
index f03fa24a07b00182613ea4f1d6d4e0fcd0b2f308..32ded11430733dcd8f285a02b2c875eb7417e492 100755 (executable)
--- a/tests/qemu-iotests/093
+++ b/tests/qemu-iotests/093
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for IO throttling
 #

diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096
index ab9cb4782212619028991140a09f5afb72600f9c..5915f92786fc56d332bbe21a9b7f962610d35aec 100755 (executable)
--- a/tests/qemu-iotests/096
+++ b/tests/qemu-iotests/096
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test that snapshots move the throttling configuration to the active
 # layer

diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index e20080e9a6c107c1dbd4e25af124667b4d8626f0..adc8a848b500b37f5c215e0d142224537b7c1b5e 100755 (executable)
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test case for the QMP 'change' command and all other associated
 # commands

diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index d3e851e1ae22315a8b472b2d88c75607295c259c..3705cbb6b33c5eca38e937bdf7baba00bde280f4 100755 (executable)
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for incremental drive-backup
 #

diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
index cd6b9e9ce7bb0b27a5297c1d6c2860efd9f74cb4..b0da4a5541abef0d3df295e80c140a4e342a6f86 100755 (executable)
--- a/tests/qemu-iotests/129
+++ b/tests/qemu-iotests/129
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests that "bdrv_drain_all" doesn't drain block jobs
 #

diff --git a/tests/qemu-iotests/132 b/tests/qemu-iotests/132
index 0f2a106c81dfe6a566c179f1a9db1078c313c272..39ea43067e6099b77f47783f879f216213d47b73 100755 (executable)
--- a/tests/qemu-iotests/132
+++ b/tests/qemu-iotests/132
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test mirror with unmap
 #

diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136
index 012ea111ac69f69bed48cae1237adea21bf0105a..d59400c9fcb1bee83005e8b6b1d504913b721250 100755 (executable)
--- a/tests/qemu-iotests/136
+++ b/tests/qemu-iotests/136
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for block device statistics
 #

diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index cbb5a76530c2b3eb50fee1aea6ec8f20651d0903..6b1a444364c968945818d16670813da709792e62 100755 (executable)
--- a/tests/qemu-iotests/139
+++ b/tests/qemu-iotests/139
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test cases for the QMP 'blockdev-del' command
 #

diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147
index 2b6f859a09d59259658060fb968a3f84fc6e44d8..f4b0a11dba89a7bcb0884be2f7071942788b6da5 100755 (executable)
--- a/tests/qemu-iotests/147
+++ b/tests/qemu-iotests/147
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test case for NBD's blockdev-add interface
 #

diff --git a/tests/qemu-iotests/148 b/tests/qemu-iotests/148
index 8c11c53cbafe22f76d098adcaeb82934aefbbfff..90931948e386dcbed7f3860072428bfa2550ec97 100755 (executable)
--- a/tests/qemu-iotests/148
+++ b/tests/qemu-iotests/148
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test the rate limit of QMP events
 #

diff --git a/tests/qemu-iotests/151 b/tests/qemu-iotests/151
index 76ae265cc166b0c7c50b9181f30d3bbe2a3cb1a0..f2df72c29c2e9677911070be4747022cd562b52e 100755 (executable)
--- a/tests/qemu-iotests/151
+++ b/tests/qemu-iotests/151
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for active mirroring
 #

diff --git a/tests/qemu-iotests/152 b/tests/qemu-iotests/152
index 732bf5f062f02db2f0d3a937a8c580311781ee7f..cc2ea09654fbc87d641eae4d7cb069acddb7f334 100755 (executable)
--- a/tests/qemu-iotests/152
+++ b/tests/qemu-iotests/152
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for drive-mirror with source size unaligned to granularity
 #

diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155
index e19485911cc0139cd8ffb61e07a82dacbc8faf72..e35b1d534b8e6cfbc19e6743a86b280452504282 100755 (executable)
--- a/tests/qemu-iotests/155
+++ b/tests/qemu-iotests/155
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test whether the backing BDSs are correct after completion of a
 # mirror block job; in "existing" modes (drive-mirror with

diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163
index d94728e0804d6834fd281590665de81c5a0124f8..5a3cc840a5df04c5fa5a320039c1a7805683729c 100755 (executable)
--- a/tests/qemu-iotests/163
+++ b/tests/qemu-iotests/163
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for shrinking images
 #

diff --git a/tests/qemu-iotests/165 b/tests/qemu-iotests/165
index 951ea011a271f07e4289c18818488cad9df96d81..b60a803daebb94e4e40e6518d6899e6591747b82 100755 (executable)
--- a/tests/qemu-iotests/165
+++ b/tests/qemu-iotests/165
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for persistent dirty bitmaps.
 #

diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169
index 9656a7f620ebe212f8d05b5f9b0118847c286fdd..2c5a132aa31512a18e31b102f38ec2c4f863f47d 100755 (executable)
--- a/tests/qemu-iotests/169
+++ b/tests/qemu-iotests/169
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for dirty bitmaps migration.
 #

diff --git a/tests/qemu-iotests/196 b/tests/qemu-iotests/196
index 92fe9244f85d4218a72473cd8b1e24f6ab21d3f2..e8fcf37273e4528acfd8bab1dc8bdcce4b28a437 100755 (executable)
--- a/tests/qemu-iotests/196
+++ b/tests/qemu-iotests/196
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test clearing unknown autoclear_features flag by qcow2 after
 # migration. This test mimics migration to older qemu.

diff --git a/tests/qemu-iotests/199 b/tests/qemu-iotests/199
index a2c8ecab5a04918d23a357930ef3abc08cc479c7..40774eed74c20a8d73908276a5110030eb8c2662 100755 (executable)
--- a/tests/qemu-iotests/199
+++ b/tests/qemu-iotests/199
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for dirty bitmaps postcopy migration.
 #

diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
index 4bb2c21e8bcc4de1d8cb5404feb52c3939e37a28..43432cb5997d26e5e08d9be1e41ace0b9ebbb1f6 100755 (executable)
--- a/tests/qemu-iotests/205
+++ b/tests/qemu-iotests/205
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tests for qmp command nbd-server-remove.
 #

diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
index d12b25306531fa7e80096026535c2f1687296fbd..489bf78bd08a440dd3d1fdeaf5692c3860e89a82 100644 (file)
--- a/tests/qemu-iotests/245
+++ b/tests/qemu-iotests/245
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test cases for the QMP 'x-blockdev-reopen' command
 #

diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index a9828251cff5d8034308226ca1c707d0ff26dce5..004a433b8be2777f58359d4cf66c48f08bc9b6d6 100755 (executable)
--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test bitmap-sync backups (incremental, differential, and partials)
 #

diff --git a/tests/qemu-iotests/258 b/tests/qemu-iotests/258
index b84cf0225447da894d17a4aed46699a9a65e175a..091755a45cfb6b43b4a734e0186b0171dff2f369 100755 (executable)
--- a/tests/qemu-iotests/258
+++ b/tests/qemu-iotests/258
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Very specific tests for adjacent commit/stream block jobs
 #

diff --git a/tests/qemu-iotests/281 b/tests/qemu-iotests/281
index 269d583b2cf36e04bb0c1c719a81c89b313e69c6..0bf973bca69c40891bff768f115aa5eebf2a9774 100755 (executable)
--- a/tests/qemu-iotests/281
+++ b/tests/qemu-iotests/281
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Test cases for blockdev + IOThread interactions
 #

diff --git a/tests/qemu-iotests/nbd-fault-injector.py b/tests/qemu-iotests/nbd-fault-injector.py
index 7e2dab6ea442cf6e28abb22931d48fcf748165ac..b158dd65a2697087dab2c1da3e28f8f3de5013de 100755 (executable)
--- a/tests/qemu-iotests/nbd-fault-injector.py
+++ b/tests/qemu-iotests/nbd-fault-injector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # NBD server - fault injection utility
 #
 # Configuration file syntax:

diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
index 91e4420b9f65e83dcc6819c708d5408450c13dc4..1c4fa2b09f1eadc7c5f62904e147f926ac9c47e4 100755 (executable)
--- a/tests/qemu-iotests/qcow2.py
+++ b/tests/qemu-iotests/qcow2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import sys

diff --git a/tests/qemu-iotests/qed.py b/tests/qemu-iotests/qed.py
index 8adaaf46c4ace924e6584cfaef19a13b3b593f22..36bca1de23704f36fd408501e835024118ede1a5 100755 (executable)
--- a/tests/qemu-iotests/qed.py
+++ b/tests/qemu-iotests/qed.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Tool to manipulate QED image files
 #