Rework iotests/check
v6 cover Rework iotests/check
Hi all!
These series has 3 goals:
- get rid of group file (to forget about rebase and in-list conflicts)
- introduce human-readable names for tests
- rewrite check into python
v6:
04: condense making 283 and 299 executable into one patch. add 298 too 06: handle three more tests
08: add qemu-storage-daemon and fuse protocol
Last patch is RFC. Patches 01-05 are simple cleanups and may be merged in separate.
Vladimir Sementsov-Ogievskiy (11):
iotests/277: use dot slash for nbd-fault-injector.py running iotests/303: use dot slash for qcow2.py running
iotests: fix some whitespaces in test output files
iotests: make tests executable
iotests/294: add shebang line
iotests: define group in each iotest
iotests: add findtests.py
iotests: add testenv.py
iotests: add testrunner.py
iotests: rewrite check into python
iotests: rename and move 169 and 199 tests
docs/devel/testing.rst | 50 +-
tests/qemu-iotests/001 | 1 +
tests/qemu-iotests/002 | 1 +
tests/qemu-iotests/003 | 1 +
tests/qemu-iotests/004 | 1 +
tests/qemu-iotests/005 | 1 +
tests/qemu-iotests/007 | 1 +
tests/qemu-iotests/008 | 1 +
tests/qemu-iotests/009 | 1 +
tests/qemu-iotests/010 | 1 +
tests/qemu-iotests/011 | 1 +
tests/qemu-iotests/012 | 1 +
tests/qemu-iotests/013 | 1 +
tests/qemu-iotests/014 | 1 +
tests/qemu-iotests/015 | 1 +
tests/qemu-iotests/017 | 1 +
tests/qemu-iotests/018 | 1 +
tests/qemu-iotests/019 | 1 +
tests/qemu-iotests/020 | 1 +
tests/qemu-iotests/021 | 1 +
tests/qemu-iotests/022 | 1 +
tests/qemu-iotests/023 | 1 +
tests/qemu-iotests/024 | 1 +
tests/qemu-iotests/025 | 1 +
tests/qemu-iotests/026 | 1 +
tests/qemu-iotests/027 | 1 +
tests/qemu-iotests/028 | 1 +
tests/qemu-iotests/029 | 1 +
tests/qemu-iotests/030 | 1 +
tests/qemu-iotests/031 | 1 +
tests/qemu-iotests/032 | 1 +
tests/qemu-iotests/033 | 1 +
tests/qemu-iotests/034 | 1 +
tests/qemu-iotests/035 | 1 +
tests/qemu-iotests/036 | 1 +
tests/qemu-iotests/037 | 1 +
tests/qemu-iotests/038 | 1 +
tests/qemu-iotests/039 | 1 +
tests/qemu-iotests/040 | 1 +
tests/qemu-iotests/041 | 1 +
tests/qemu-iotests/042 | 1 +
tests/qemu-iotests/043 | 1 +
tests/qemu-iotests/044 | 1 +
tests/qemu-iotests/045 | 1 +
tests/qemu-iotests/046 | 1 +
tests/qemu-iotests/047 | 1 +
tests/qemu-iotests/048 | 1 +
tests/qemu-iotests/049 | 1 +
tests/qemu-iotests/050 | 1 +
tests/qemu-iotests/051 | 1 +
tests/qemu-iotests/052 | 1 +
tests/qemu-iotests/053 | 1 +
tests/qemu-iotests/054 | 1 +
tests/qemu-iotests/055 | 1 +
tests/qemu-iotests/056 | 1 +
tests/qemu-iotests/057 | 1 +
tests/qemu-iotests/058 | 1 +
tests/qemu-iotests/059 | 1 +
tests/qemu-iotests/060 | 1 +
tests/qemu-iotests/061 | 1 +
tests/qemu-iotests/062 | 1 +
tests/qemu-iotests/063 | 1 +
tests/qemu-iotests/064 | 1 +
tests/qemu-iotests/065 | 1 +
tests/qemu-iotests/066 | 1 +
tests/qemu-iotests/068 | 1 +
tests/qemu-iotests/069 | 1 +
tests/qemu-iotests/070 | 1 +
tests/qemu-iotests/071 | 1 +
tests/qemu-iotests/072 | 1 +
tests/qemu-iotests/073 | 1 +
tests/qemu-iotests/074 | 1 +
tests/qemu-iotests/075 | 1 +
tests/qemu-iotests/076 | 1 +
tests/qemu-iotests/077 | 1 +
tests/qemu-iotests/078 | 1 +
tests/qemu-iotests/079 | 1 +
tests/qemu-iotests/080 | 1 +
tests/qemu-iotests/081 | 1 +
tests/qemu-iotests/082 | 1 +
tests/qemu-iotests/083 | 1 +
tests/qemu-iotests/084 | 1 +
tests/qemu-iotests/085 | 1 +
tests/qemu-iotests/086 | 1 +
tests/qemu-iotests/087 | 1 +
tests/qemu-iotests/088 | 1 +
tests/qemu-iotests/089 | 1 +
tests/qemu-iotests/090 | 1 +
tests/qemu-iotests/091 | 1 +
tests/qemu-iotests/092 | 1 +
tests/qemu-iotests/093 | 1 +
tests/qemu-iotests/094 | 1 +
tests/qemu-iotests/095 | 1 +
tests/qemu-iotests/096 | 1 +
tests/qemu-iotests/097 | 1 +
tests/qemu-iotests/098 | 1 +
tests/qemu-iotests/099 | 1 +
tests/qemu-iotests/101 | 1 +
tests/qemu-iotests/102 | 1 +
tests/qemu-iotests/103 | 1 +
tests/qemu-iotests/104 | 1 +
tests/qemu-iotests/105 | 1 +
tests/qemu-iotests/106 | 1 +
tests/qemu-iotests/107 | 1 +
tests/qemu-iotests/108 | 1 +
tests/qemu-iotests/109 | 1 +
tests/qemu-iotests/110 | 1 +
tests/qemu-iotests/111 | 1 +
tests/qemu-iotests/112 | 1 +
tests/qemu-iotests/113 | 1 +
tests/qemu-iotests/114 | 1 +
tests/qemu-iotests/115 | 1 +
tests/qemu-iotests/116 | 1 +
tests/qemu-iotests/117 | 1 +
tests/qemu-iotests/118 | 1 +
tests/qemu-iotests/119 | 1 +
tests/qemu-iotests/120 | 1 +
tests/qemu-iotests/121 | 1 +
tests/qemu-iotests/122 | 1 +
tests/qemu-iotests/123 | 1 +
tests/qemu-iotests/124 | 1 +
tests/qemu-iotests/125 | 1 +
tests/qemu-iotests/126 | 1 +
tests/qemu-iotests/127 | 1 +
tests/qemu-iotests/128 | 1 +
tests/qemu-iotests/129 | 1 +
tests/qemu-iotests/130 | 1 +
tests/qemu-iotests/131 | 1 +
tests/qemu-iotests/132 | 1 +
tests/qemu-iotests/133 | 1 +
tests/qemu-iotests/134 | 1 +
tests/qemu-iotests/135 | 1 +
tests/qemu-iotests/136 | 1 +
tests/qemu-iotests/137 | 1 +
tests/qemu-iotests/138 | 1 +
tests/qemu-iotests/139 | 1 +
tests/qemu-iotests/140 | 1 +
tests/qemu-iotests/141 | 1 +
tests/qemu-iotests/143 | 1 +
tests/qemu-iotests/144 | 1 +
tests/qemu-iotests/145 | 1 +
tests/qemu-iotests/146 | 1 +
tests/qemu-iotests/147 | 1 +
tests/qemu-iotests/148 | 1 +
tests/qemu-iotests/149 | 1 +
tests/qemu-iotests/150 | 1 +
tests/qemu-iotests/151 | 1 +
tests/qemu-iotests/152 | 1 +
tests/qemu-iotests/153 | 1 +
tests/qemu-iotests/154 | 1 +
tests/qemu-iotests/155 | 1 +
tests/qemu-iotests/156 | 1 +
tests/qemu-iotests/157 | 1 +
tests/qemu-iotests/158 | 1 +
tests/qemu-iotests/159 | 1 +
tests/qemu-iotests/160 | 1 +
tests/qemu-iotests/161 | 1 +
tests/qemu-iotests/162 | 1 +
tests/qemu-iotests/163 | 1 +
tests/qemu-iotests/165 | 1 +
tests/qemu-iotests/170 | 1 +
tests/qemu-iotests/171 | 1 +
tests/qemu-iotests/172 | 1 +
tests/qemu-iotests/173 | 1 +
tests/qemu-iotests/174 | 1 +
tests/qemu-iotests/175 | 1 +
tests/qemu-iotests/175.out | 2 +-
tests/qemu-iotests/176 | 1 +
tests/qemu-iotests/177 | 1 +
tests/qemu-iotests/178 | 1 +
tests/qemu-iotests/179 | 1 +
tests/qemu-iotests/181 | 1 +
tests/qemu-iotests/182 | 1 +
tests/qemu-iotests/183 | 1 +
tests/qemu-iotests/184 | 1 +
tests/qemu-iotests/185 | 1 +
tests/qemu-iotests/186 | 1 +
tests/qemu-iotests/187 | 1 +
tests/qemu-iotests/188 | 1 +
tests/qemu-iotests/189 | 1 +
tests/qemu-iotests/190 | 1 +
tests/qemu-iotests/191 | 1 +
tests/qemu-iotests/192 | 1 +
tests/qemu-iotests/194 | 1 +
tests/qemu-iotests/195 | 1 +
tests/qemu-iotests/196 | 1 +
tests/qemu-iotests/197 | 1 +
tests/qemu-iotests/198 | 1 +
tests/qemu-iotests/200 | 1 +
tests/qemu-iotests/201 | 1 +
tests/qemu-iotests/202 | 1 +
tests/qemu-iotests/203 | 1 +
tests/qemu-iotests/204 | 1 +
tests/qemu-iotests/205 | 1 +
tests/qemu-iotests/206 | 1 +
tests/qemu-iotests/207 | 1 +
tests/qemu-iotests/208 | 1 +
tests/qemu-iotests/209 | 1 +
tests/qemu-iotests/210 | 1 +
tests/qemu-iotests/211 | 1 +
tests/qemu-iotests/212 | 1 +
tests/qemu-iotests/213 | 1 +
tests/qemu-iotests/214 | 1 +
tests/qemu-iotests/215 | 1 +
tests/qemu-iotests/216 | 1 +
tests/qemu-iotests/217 | 1 +
tests/qemu-iotests/218 | 1 +
tests/qemu-iotests/219 | 1 +
tests/qemu-iotests/220 | 1 +
tests/qemu-iotests/221 | 1 +
tests/qemu-iotests/222 | 1 +
tests/qemu-iotests/223 | 1 +
tests/qemu-iotests/224 | 1 +
tests/qemu-iotests/225 | 1 +
tests/qemu-iotests/226 | 1 +
tests/qemu-iotests/227 | 1 +
tests/qemu-iotests/228 | 1 +
tests/qemu-iotests/229 | 1 +
tests/qemu-iotests/231 | 1 +
tests/qemu-iotests/232 | 1 +
tests/qemu-iotests/233 | 1 +
tests/qemu-iotests/234 | 1 +
tests/qemu-iotests/235 | 1 +
tests/qemu-iotests/236 | 1 +
tests/qemu-iotests/237 | 1 +
tests/qemu-iotests/238 | 1 +
tests/qemu-iotests/239 | 1 +
tests/qemu-iotests/240 | 1 +
tests/qemu-iotests/241 | 1 +
tests/qemu-iotests/242 | 1 +
tests/qemu-iotests/243 | 1 +
tests/qemu-iotests/244 | 1 +
tests/qemu-iotests/245 | 1 +
tests/qemu-iotests/246 | 1 +
tests/qemu-iotests/247 | 1 +
tests/qemu-iotests/248 | 1 +
tests/qemu-iotests/249 | 1 +
tests/qemu-iotests/250 | 1 +
tests/qemu-iotests/251 | 1 +
tests/qemu-iotests/252 | 1 +
tests/qemu-iotests/253 | 1 +
tests/qemu-iotests/254 | 1 +
tests/qemu-iotests/255 | 1 +
tests/qemu-iotests/256 | 1 +
tests/qemu-iotests/257 | 1 +
tests/qemu-iotests/258 | 1 +
tests/qemu-iotests/259 | 1 +
tests/qemu-iotests/260 | 1 +
tests/qemu-iotests/261 | 1 +
tests/qemu-iotests/262 | 1 +
tests/qemu-iotests/263 | 1 +
tests/qemu-iotests/264 | 1 +
tests/qemu-iotests/265 | 1 +
tests/qemu-iotests/266 | 1 +
tests/qemu-iotests/267 | 1 +
tests/qemu-iotests/268 | 1 +
tests/qemu-iotests/270 | 1 +
tests/qemu-iotests/271 | 1 +
tests/qemu-iotests/271.out | 12 +-
tests/qemu-iotests/272 | 1 +
tests/qemu-iotests/273 | 1 +
tests/qemu-iotests/274 | 1 +
tests/qemu-iotests/277 | 3 +-
tests/qemu-iotests/279 | 1 +
tests/qemu-iotests/280 | 1 +
tests/qemu-iotests/281 | 1 +
tests/qemu-iotests/282 | 1 +
tests/qemu-iotests/283 | 1 +
tests/qemu-iotests/284 | 1 +
tests/qemu-iotests/286 | 1 +
tests/qemu-iotests/287 | 1 +
tests/qemu-iotests/287.out | 10 +-
tests/qemu-iotests/288 | 1 +
tests/qemu-iotests/289 | 1 +
tests/qemu-iotests/290 | 1 +
tests/qemu-iotests/291 | 1 +
tests/qemu-iotests/292 | 1 +
tests/qemu-iotests/293 | 1 +
tests/qemu-iotests/294 | 2 +
tests/qemu-iotests/295 | 1 +
tests/qemu-iotests/296 | 1 +
tests/qemu-iotests/297 | 1 +
tests/qemu-iotests/298 | 0
tests/qemu-iotests/299 | 1 +
tests/qemu-iotests/300 | 1 +
tests/qemu-iotests/301 | 1 +
tests/qemu-iotests/302 | 1 +
tests/qemu-iotests/303 | 3 +-
tests/qemu-iotests/304 | 1 +
tests/qemu-iotests/305 | 1 +
tests/qemu-iotests/307 | 1 +
tests/qemu-iotests/308 | 1 +
tests/qemu-iotests/309 | 1 +
tests/qemu-iotests/312 | 1 +
tests/qemu-iotests/check | 994 +-----------------
tests/qemu-iotests/findtests.py | 229 ++++
tests/qemu-iotests/group | 321 ------
tests/qemu-iotests/testenv.py | 328 ++++++
tests/qemu-iotests/testrunner.py | 351 +++++++
.../migrate-bitmaps-postcopy-test} | 1 +
.../migrate-bitmaps-postcopy-test.out} | 0
.../{169 => tests/migrate-bitmaps-test} | 1 +
.../migrate-bitmaps-test.out} | 0
303 files changed, 1291 insertions(+), 1302 deletions(-)
mode change 100644 => 100755 tests/qemu-iotests/283
mode change 100644 => 100755 tests/qemu-iotests/298
mode change 100644 => 100755 tests/qemu-iotests/299
create mode 100755 tests/qemu-iotests/findtests.py
delete mode 100644 tests/qemu-iotests/group
create mode 100755 tests/qemu-iotests/testenv.py
create mode 100644 tests/qemu-iotests/testrunner.py
rename tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test} (99%)
rename tests/qemu-iotests/{199.out => tests/migrate-bitmaps-postcopy-test.out} (100%)
rename tests/qemu-iotests/{169 => tests/migrate-bitmaps-test} (99%)
rename tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out} (100%)Signature · 1 line
2.29.2
PATCH v6 1/11 iotests/277: use dot slash for nbd-fault-injector.py running
If you run './check 277', check includes common.config which adjusts $PATH to include '.' first, and therefore finds nbd-fault-injector.py on PATH. But if you run './277' directly, there is nothing to adjust PATH, and if '.' is not already on your PATH by other means, the test fails because the executable is not found. Adjust how we invoke the helper executable to avoid needing a PATH search in the first place.
--- tests/qemu-iotests/277 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/277 +1 -1
@@ -42,7 +42,7 @@ def make_conf_file(event): def start_server_NBD(event): make_conf_file(event) - srv = subprocess.Popen(['nbd-fault-injector.py', '--classic-negotiation', + srv = subprocess.Popen(['./nbd-fault-injector.py', '--classic-negotiation', nbd_sock, conf_file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) line = srv.stdout.readline()
Signature · 1 line
2.29.2
Re: [PATCH v6 01/11] iotests/277: use dot slash for nbd-fault-injector.py running
Quoted 7 lines · Vladimir Sementsov-Ogievskiy
If you run './check 277', check includes common.config which adjusts $PATH to include '.' first, and therefore finds
nbd-fault-injector.pyon PATH. But if you run './277' directly, there is nothing to adjust PATH, and if '.' is not already on your PATH by other means, the test fails because the executable is not found. Adjust how we invoke the helper executable to avoid needing a PATH search in the first place.
Quoted 5 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by Eric Blake <[email protected]>--- tests/qemu-iotests/277 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
As this one touches NBD, I'm happy to queue it in my next NBD pull request if the entire series takes longer to collect enough reviews.
Quoted 15 lines
tests/qemu-iotests/277 +1
-1@@ -42,7 +42,7 @@ def make_conf_file(event): def start_server_NBD(event): make_conf_file(event) - srv = subprocess.Popen(['nbd-fault-injector.py', '--classic-negotiation', + srv = subprocess.Popen(['./nbd-fault-injector.py', '--classic-negotiation', nbd_sock, conf_file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) line = srv.stdout.readline()
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v6 2/11 iotests/303: use dot slash for qcow2.py running
In reply to Vladimir Sementsov-OgievskiyIf you run './check 303', check includes common.config which adjusts $PATH to include '.' first, and therefore finds qcow2.py on PATH. But if you run './303' directly, there is nothing to adjust PATH, and if '.' is not already on your PATH by other means, the test fails because the executable is not found. Adjust how we invoke the helper executable to avoid needing a PATH search in the first place.
--- tests/qemu-iotests/303 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/303 +1 -1
@@ -56,7 +56,7 @@ qemu_img_create('-f', iotests.imgfmt, disk, '10M') add_bitmap(1, 0, 6, False) add_bitmap(2, 6, 8, True) -dump = ['qcow2.py', disk, 'dump-header'] +dump = ['./qcow2.py', disk, 'dump-header'] subprocess.run(dump) # Dump the metadata in JSON format dump.append('-j')
Signature · 1 line
2.29.2
Re: [PATCH v6 02/11] iotests/303: use dot slash for qcow2.py running
Quoted 11 lines · Vladimir Sementsov-Ogievskiy
If you run './check 303', check includes common.config which adjusts $PATH to include '.' first, and therefore finds
qcow2.pyon PATH. But if you run './303' directly, there is nothing to adjust PATH, and if '.' is not already on your PATH by other means, the test fails because the executable is not found. Adjust how we invoke the helper executable to avoid needing a PATH search in the first place.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/303 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
tests/qemu-iotests/303 +1
-1@@ -56,7 +56,7 @@ qemu_img_create('-f', iotests.imgfmt, disk, '10M') add_bitmap(1, 0, 6, False) add_bitmap(2, 6, 8, True) -dump = ['qcow2.py', disk, 'dump-header'] +dump = ['./qcow2.py', disk, 'dump-header'] subprocess.run(dump) # Dump the metadata in JSON format dump.append('-j')
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v6 3/11 iotests: fix some whitespaces in test output files
In reply to Vladimir Sementsov-OgievskiyWe are going to be stricter about comparing test result with .out files. So, fix some whitespaces now.
--- tests/qemu-iotests/175.out | 2 +- tests/qemu-iotests/271.out | 12 ++++++------ tests/qemu-iotests/287.out | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-)
tests/qemu-iotests/175.out +1 -1
@@ -23,4 +23,4 @@ size=4096, min allocation == resize empty image with block_resize == Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0 size=1048576, min allocation - *** done +*** done
tests/qemu-iotests/271.out +6 -6
@@ -500,7 +500,7 @@ L2 entry #0: 0x8000000000050001 0000000000000001 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 L2 entry #1: 0x8000000000060000 00000001ffffffff -qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be suppressed +qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be suppressed write failed: Input/output error ### Corrupted L2 entries - write test (unallocated) ###
@@ -515,14 +515,14 @@ L2 entry #0: 0x8000000000060000 0000000000000001 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 L2 entry #0: 0x0000000000000000 0000000000000001 -qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed +qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed write failed: Input/output error # Both 'subcluster is zero' and 'subcluster is allocated' bits set Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 L2 entry #1: 0x0000000000000000 0000000100000001 -qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be suppressed +qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be suppressed write failed: Input/output error ### Compressed cluster with subcluster bitmap != 0 - write test ###
@@ -583,7 +583,7 @@ read 524288/524288 bytes at offset 0 read 524288/524288 bytes at offset 524288 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Offset Length Mapped to File -0 0x80000 0 TEST_DIR/t.qcow2.base +0 0x80000 0 TEST_DIR/t.qcow2.base # backing file and preallocation=falloc Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=524288 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=raw preallocation=falloc Image resized.
@@ -592,7 +592,7 @@ read 524288/524288 bytes at offset 0 read 524288/524288 bytes at offset 524288 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Offset Length Mapped to File -0 0x80000 0 TEST_DIR/t.qcow2.base +0 0x80000 0 TEST_DIR/t.qcow2.base # backing file and preallocation=full Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=524288 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=raw preallocation=full Image resized.
@@ -601,7 +601,7 @@ read 524288/524288 bytes at offset 0 read 524288/524288 bytes at offset 524288 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Offset Length Mapped to File -0 0x80000 0 TEST_DIR/t.qcow2.base +0 0x80000 0 TEST_DIR/t.qcow2.base ### Image resizing with preallocation and backing files ###
tests/qemu-iotests/287.out +5 -5
@@ -10,22 +10,22 @@ incompatible_features [] Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 incompatible_features [3] -=== Testing zlib with incompatible bit set === +=== Testing zlib with incompatible bit set === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 incompatible_features [3] -=== Testing zstd with incompatible bit unset === +=== Testing zstd with incompatible bit unset === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 incompatible_features [] -=== Testing compression type values === +=== Testing compression type values === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 - 0 +0 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 - 1 +1 === Testing simple reading and writing with zstd ===
Signature · 1 line
2.29.2
Re: [PATCH v6 03/11] iotests: fix some whitespaces in test output files
Quoted 9 lines · Vladimir Sementsov-Ogievskiy
We are going to be stricter about comparing test result with .out files. So, fix some whitespaces now.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/175.out | 2 +- tests/qemu-iotests/271.out | 12 ++++++------ tests/qemu-iotests/287.out | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v6 4/11 iotests: make tests executable
In reply to Vladimir Sementsov-OgievskiyAll other test files are executable. Fix these.
--- tests/qemu-iotests/283 | 0 tests/qemu-iotests/298 | 0 tests/qemu-iotests/299 | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/qemu-iotests/283 mode change 100644 => 100755 tests/qemu-iotests/298 mode change 100644 => 100755 tests/qemu-iotests/299
tests/qemu-iotests/283 +0 -0
tests/qemu-iotests/298 +0 -0
tests/qemu-iotests/299 +0 -0
Signature · 1 line
2.29.2
Re: [PATCH v6 04/11] iotests: make tests executable
Quoted 11 lines · Vladimir Sementsov-Ogievskiy
All other test files are executable. Fix these.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/283 | 0 tests/qemu-iotests/298 | 0 tests/qemu-iotests/299 | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/qemu-iotests/283 mode change 100644 => 100755 tests/qemu-iotests/298 mode change 100644 => 100755 tests/qemu-iotests/299
Quoted 11 lines
tests/qemu-iotests/283 +0
-0tests/qemu-iotests/298 +0
-0tests/qemu-iotests/299 +0
-0
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v6 5/11 iotests/294: add shebang line
In reply to Vladimir Sementsov-Ogievskiy--- tests/qemu-iotests/294 | 1 + 1 file changed, 1 insertion(+)
tests/qemu-iotests/294 +1 -0
@@ -1,3 +1,4 @@ +#!/usr/bin/env bash # # Copyright (C) 2019 Red Hat, Inc. #
Signature · 1 line
2.29.2
Re: [PATCH v6 05/11] iotests/294: add shebang line
Quoted 4 lines · Vladimir Sementsov-Ogievskiy
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/294 | 1 + 1 file changed, 1 insertion(+)
Quoted 11 lines
tests/qemu-iotests/294 +1
-0@@ -1,3 +1,4 @@ +#!/usr/bin/env bash # # Copyright (C) 2019 Red Hat, Inc. #
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v6 6/11 iotests: define group in each iotest
In reply to Vladimir Sementsov-OgievskiyWe are going to drop group file. Define group in tests as a preparatory step.
The patch is generated by
cd tests/qemu-iotests
grep '^[0-9]\{3\} ' group | while read line; do
file=$(awk '{print $1}' <<< "$line");
groups=$(sed -e 's/^... //' <<< "$line");
awk "NR==2{print \"# group: $groups\"}1" $file > tmp;
cat tmp > $file;
done--- tests/qemu-iotests/001 | 1 + tests/qemu-iotests/002 | 1 + tests/qemu-iotests/003 | 1 + tests/qemu-iotests/004 | 1 + tests/qemu-iotests/005 | 1 + tests/qemu-iotests/007 | 1 + tests/qemu-iotests/008 | 1 + tests/qemu-iotests/009 | 1 + tests/qemu-iotests/010 | 1 + tests/qemu-iotests/011 | 1 + tests/qemu-iotests/012 | 1 + tests/qemu-iotests/013 | 1 + tests/qemu-iotests/014 | 1 + tests/qemu-iotests/015 | 1 + tests/qemu-iotests/017 | 1 + tests/qemu-iotests/018 | 1 + tests/qemu-iotests/019 | 1 + tests/qemu-iotests/020 | 1 + tests/qemu-iotests/021 | 1 + tests/qemu-iotests/022 | 1 + tests/qemu-iotests/023 | 1 + tests/qemu-iotests/024 | 1 + tests/qemu-iotests/025 | 1 + tests/qemu-iotests/026 | 1 + tests/qemu-iotests/027 | 1 + tests/qemu-iotests/028 | 1 + tests/qemu-iotests/029 | 1 + tests/qemu-iotests/030 | 1 + tests/qemu-iotests/031 | 1 + tests/qemu-iotests/032 | 1 + tests/qemu-iotests/033 | 1 + tests/qemu-iotests/034 | 1 + tests/qemu-iotests/035 | 1 + tests/qemu-iotests/036 | 1 + tests/qemu-iotests/037 | 1 + tests/qemu-iotests/038 | 1 + tests/qemu-iotests/039 | 1 + tests/qemu-iotests/040 | 1 + tests/qemu-iotests/041 | 1 + tests/qemu-iotests/042 | 1 + tests/qemu-iotests/043 | 1 + tests/qemu-iotests/044 | 1 + tests/qemu-iotests/045 | 1 + tests/qemu-iotests/046 | 1 + tests/qemu-iotests/047 | 1 + tests/qemu-iotests/048 | 1 + tests/qemu-iotests/049 | 1 + tests/qemu-iotests/050 | 1 + tests/qemu-iotests/051 | 1 + tests/qemu-iotests/052 | 1 + tests/qemu-iotests/053 | 1 + tests/qemu-iotests/054 | 1 + tests/qemu-iotests/055 | 1 + tests/qemu-iotests/056 | 1 + tests/qemu-iotests/057 | 1 + tests/qemu-iotests/058 | 1 + tests/qemu-iotests/059 | 1 + tests/qemu-iotests/060 | 1 + tests/qemu-iotests/061 | 1 + tests/qemu-iotests/062 | 1 + tests/qemu-iotests/063 | 1 + tests/qemu-iotests/064 | 1 + tests/qemu-iotests/065 | 1 + tests/qemu-iotests/066 | 1 + tests/qemu-iotests/068 | 1 + tests/qemu-iotests/069 | 1 + tests/qemu-iotests/070 | 1 + tests/qemu-iotests/071 | 1 + tests/qemu-iotests/072 | 1 + tests/qemu-iotests/073 | 1 + tests/qemu-iotests/074 | 1 + tests/qemu-iotests/075 | 1 + tests/qemu-iotests/076 | 1 + tests/qemu-iotests/077 | 1 + tests/qemu-iotests/078 | 1 + tests/qemu-iotests/079 | 1 + tests/qemu-iotests/080 | 1 + tests/qemu-iotests/081 | 1 + tests/qemu-iotests/082 | 1 + tests/qemu-iotests/083 | 1 + tests/qemu-iotests/084 | 1 + tests/qemu-iotests/085 | 1 + tests/qemu-iotests/086 | 1 + tests/qemu-iotests/087 | 1 + tests/qemu-iotests/088 | 1 + tests/qemu-iotests/089 | 1 + tests/qemu-iotests/090 | 1 + tests/qemu-iotests/091 | 1 + tests/qemu-iotests/092 | 1 + tests/qemu-iotests/093 | 1 + tests/qemu-iotests/094 | 1 + tests/qemu-iotests/095 | 1 + tests/qemu-iotests/096 | 1 + tests/qemu-iotests/097 | 1 + tests/qemu-iotests/098 | 1 + tests/qemu-iotests/099 | 1 + tests/qemu-iotests/101 | 1 + tests/qemu-iotests/102 | 1 + tests/qemu-iotests/103 | 1 + tests/qemu-iotests/104 | 1 + tests/qemu-iotests/105 | 1 + tests/qemu-iotests/106 | 1 + tests/qemu-iotests/107 | 1 + tests/qemu-iotests/108 | 1 + tests/qemu-iotests/109 | 1 + tests/qemu-iotests/110 | 1 + tests/qemu-iotests/111 | 1 + tests/qemu-iotests/112 | 1 + tests/qemu-iotests/113 | 1 + tests/qemu-iotests/114 | 1 + tests/qemu-iotests/115 | 1 + tests/qemu-iotests/116 | 1 + tests/qemu-iotests/117 | 1 + tests/qemu-iotests/118 | 1 + tests/qemu-iotests/119 | 1 + tests/qemu-iotests/120 | 1 + tests/qemu-iotests/121 | 1 + tests/qemu-iotests/122 | 1 + tests/qemu-iotests/123 | 1 + tests/qemu-iotests/124 | 1 + tests/qemu-iotests/125 | 1 + tests/qemu-iotests/126 | 1 + tests/qemu-iotests/127 | 1 + tests/qemu-iotests/128 | 1 + tests/qemu-iotests/129 | 1 + tests/qemu-iotests/130 | 1 + tests/qemu-iotests/131 | 1 + tests/qemu-iotests/132 | 1 + tests/qemu-iotests/133 | 1 + tests/qemu-iotests/134 | 1 + tests/qemu-iotests/135 | 1 + tests/qemu-iotests/136 | 1 + tests/qemu-iotests/137 | 1 + tests/qemu-iotests/138 | 1 + tests/qemu-iotests/139 | 1 + tests/qemu-iotests/140 | 1 + tests/qemu-iotests/141 | 1 + tests/qemu-iotests/143 | 1 + tests/qemu-iotests/144 | 1 + tests/qemu-iotests/145 | 1 + tests/qemu-iotests/146 | 1 + tests/qemu-iotests/147 | 1 + tests/qemu-iotests/148 | 1 + tests/qemu-iotests/149 | 1 + tests/qemu-iotests/150 | 1 + tests/qemu-iotests/151 | 1 + tests/qemu-iotests/152 | 1 + tests/qemu-iotests/153 | 1 + tests/qemu-iotests/154 | 1 + tests/qemu-iotests/155 | 1 + tests/qemu-iotests/156 | 1 + tests/qemu-iotests/157 | 1 + tests/qemu-iotests/158 | 1 + tests/qemu-iotests/159 | 1 + tests/qemu-iotests/160 | 1 + tests/qemu-iotests/161 | 1 + tests/qemu-iotests/162 | 1 + tests/qemu-iotests/163 | 1 + tests/qemu-iotests/165 | 1 + tests/qemu-iotests/169 | 1 + tests/qemu-iotests/170 | 1 + tests/qemu-iotests/171 | 1 + tests/qemu-iotests/172 | 1 + tests/qemu-iotests/173 | 1 + tests/qemu-iotests/174 | 1 + tests/qemu-iotests/175 | 1 + tests/qemu-iotests/176 | 1 + tests/qemu-iotests/177 | 1 + tests/qemu-iotests/178 | 1 + tests/qemu-iotests/179 | 1 + tests/qemu-iotests/181 | 1 + tests/qemu-iotests/182 | 1 + tests/qemu-iotests/183 | 1 + tests/qemu-iotests/184 | 1 + tests/qemu-iotests/185 | 1 + tests/qemu-iotests/186 | 1 + tests/qemu-iotests/187 | 1 + tests/qemu-iotests/188 | 1 + tests/qemu-iotests/189 | 1 + tests/qemu-iotests/190 | 1 + tests/qemu-iotests/191 | 1 + tests/qemu-iotests/192 | 1 + tests/qemu-iotests/194 | 1 + tests/qemu-iotests/195 | 1 + tests/qemu-iotests/196 | 1 + tests/qemu-iotests/197 | 1 + tests/qemu-iotests/198 | 1 + tests/qemu-iotests/199 | 1 + tests/qemu-iotests/200 | 1 + tests/qemu-iotests/201 | 1 + tests/qemu-iotests/202 | 1 + tests/qemu-iotests/203 | 1 + tests/qemu-iotests/204 | 1 + tests/qemu-iotests/205 | 1 + tests/qemu-iotests/206 | 1 + tests/qemu-iotests/207 | 1 + tests/qemu-iotests/208 | 1 + tests/qemu-iotests/209 | 1 + tests/qemu-iotests/210 | 1 + tests/qemu-iotests/211 | 1 + tests/qemu-iotests/212 | 1 + tests/qemu-iotests/213 | 1 + tests/qemu-iotests/214 | 1 + tests/qemu-iotests/215 | 1 + tests/qemu-iotests/216 | 1 + tests/qemu-iotests/217 | 1 + tests/qemu-iotests/218 | 1 + tests/qemu-iotests/219 | 1 + tests/qemu-iotests/220 | 1 + tests/qemu-iotests/221 | 1 + tests/qemu-iotests/222 | 1 + tests/qemu-iotests/223 | 1 + tests/qemu-iotests/224 | 1 + tests/qemu-iotests/225 | 1 + tests/qemu-iotests/226 | 1 + tests/qemu-iotests/227 | 1 + tests/qemu-iotests/228 | 1 + tests/qemu-iotests/229 | 1 + tests/qemu-iotests/231 | 1 + tests/qemu-iotests/232 | 1 + tests/qemu-iotests/233 | 1 + tests/qemu-iotests/234 | 1 + tests/qemu-iotests/235 | 1 + tests/qemu-iotests/236 | 1 + tests/qemu-iotests/237 | 1 + tests/qemu-iotests/238 | 1 + tests/qemu-iotests/239 | 1 + tests/qemu-iotests/240 | 1 + tests/qemu-iotests/241 | 1 + tests/qemu-iotests/242 | 1 + tests/qemu-iotests/243 | 1 + tests/qemu-iotests/244 | 1 + tests/qemu-iotests/245 | 1 + tests/qemu-iotests/246 | 1 + tests/qemu-iotests/247 | 1 + tests/qemu-iotests/248 | 1 + tests/qemu-iotests/249 | 1 + tests/qemu-iotests/250 | 1 + tests/qemu-iotests/251 | 1 + tests/qemu-iotests/252 | 1 + tests/qemu-iotests/253 | 1 + tests/qemu-iotests/254 | 1 + tests/qemu-iotests/255 | 1 + tests/qemu-iotests/256 | 1 + tests/qemu-iotests/257 | 1 + tests/qemu-iotests/258 | 1 + tests/qemu-iotests/259 | 1 + tests/qemu-iotests/260 | 1 + tests/qemu-iotests/261 | 1 + tests/qemu-iotests/262 | 1 + tests/qemu-iotests/263 | 1 + tests/qemu-iotests/264 | 1 + tests/qemu-iotests/265 | 1 + tests/qemu-iotests/266 | 1 + tests/qemu-iotests/267 | 1 + tests/qemu-iotests/268 | 1 + tests/qemu-iotests/270 | 1 + tests/qemu-iotests/271 | 1 + tests/qemu-iotests/272 | 1 + tests/qemu-iotests/273 | 1 + tests/qemu-iotests/274 | 1 + tests/qemu-iotests/277 | 1 + tests/qemu-iotests/279 | 1 + tests/qemu-iotests/280 | 1 + tests/qemu-iotests/281 | 1 + tests/qemu-iotests/282 | 1 + tests/qemu-iotests/283 | 1 + tests/qemu-iotests/284 | 1 + tests/qemu-iotests/286 | 1 + tests/qemu-iotests/287 | 1 + tests/qemu-iotests/288 | 1 + tests/qemu-iotests/289 | 1 + tests/qemu-iotests/290 | 1 + tests/qemu-iotests/291 | 1 + tests/qemu-iotests/292 | 1 + tests/qemu-iotests/293 | 1 + tests/qemu-iotests/294 | 1 + tests/qemu-iotests/295 | 1 + tests/qemu-iotests/296 | 1 + tests/qemu-iotests/297 | 1 + tests/qemu-iotests/299 | 1 + tests/qemu-iotests/300 | 1 + tests/qemu-iotests/301 | 1 + tests/qemu-iotests/302 | 1 + tests/qemu-iotests/303 | 1 + tests/qemu-iotests/304 | 1 + tests/qemu-iotests/305 | 1 + tests/qemu-iotests/307 | 1 + tests/qemu-iotests/308 | 1 + tests/qemu-iotests/309 | 1 + tests/qemu-iotests/312 | 1 + 291 files changed, 291 insertions(+)
tests/qemu-iotests/001 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test simple read/write using plain bdrv_pread/bdrv_pwrite #
tests/qemu-iotests/002 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test simple read/write using plain bdrv_pread/bdrv_pwrite #
tests/qemu-iotests/003 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test simple read/write using bdrv_aio_readv/bdrv_aio_writev #
tests/qemu-iotests/004 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Make sure we can't read and write outside of the image size. #
tests/qemu-iotests/005 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: img auto quick # # Make sure qemu-img can create 5TB images #
tests/qemu-iotests/007 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: snapshot auto # # Check for one possible case of qcow2 refcount corruption. #
tests/qemu-iotests/008 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test simple asynchronous read/write operations. #
tests/qemu-iotests/009 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Nolan I qcow2 corruption - incorrectly reports free clusters #
tests/qemu-iotests/010 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Nolan II qcow2 corruption - wrong used cluster #
tests/qemu-iotests/011 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test for AIO allocation on the same cluster #
tests/qemu-iotests/012 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: auto quick # # Make sure we can open read-only images #
tests/qemu-iotests/013 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # qcow2 pattern test, empty and compressed image - 4k cluster patterns #
tests/qemu-iotests/014 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # qcow2 pattern test, complex patterns including compression and snapshots # Using patterns for 4k cluster size.
tests/qemu-iotests/015 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw snapshot # # Combined test to grow the refcount table and test snapshots. #
tests/qemu-iotests/017 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw backing auto quick # # Simple backing file reads #
tests/qemu-iotests/018 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw backing auto quick # # Merge backing file into test image when converting the image #
tests/qemu-iotests/019 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw backing auto quick # # When using a backing file for the output image in qemu-img convert, # the backing file clusters must not copied. The data must still be
tests/qemu-iotests/020 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw backing auto quick # # Commit changes to backing file #
tests/qemu-iotests/021 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: io auto quick # # Test handling of invalid patterns arguments to qemu-io #
tests/qemu-iotests/022 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw snapshot auto # # Test bdrv_load/save_vmstate using the usual patterns #
tests/qemu-iotests/023 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # qcow2 pattern test with various cluster sizes #
tests/qemu-iotests/024 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw backing auto quick # # Rebasing COW images #
tests/qemu-iotests/025 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Resizing images #
tests/qemu-iotests/026 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw blkdbg # # qcow2 error path testing #
tests/qemu-iotests/027 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test that sub-cluster allocating writes zero the rest of the cluster #
tests/qemu-iotests/028 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw backing quick # # Test that backing files can be smaller than the image #
tests/qemu-iotests/029 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # qcow2 internal snapshots/VM state tests #
tests/qemu-iotests/030 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw auto backing # # Tests for image streaming. #
tests/qemu-iotests/031 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test that all qcow2 header extensions survive a header rewrite #
tests/qemu-iotests/032 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test that AIO requests are drained before an image is closed. This used # to segfault because the request coroutine kept running even after the
tests/qemu-iotests/033 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test aligned and misaligned write zeroes operations. #
tests/qemu-iotests/034 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Test bdrv_pwrite_zeroes with backing files (see also 154) #
tests/qemu-iotests/035 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Let a few AIO requests run in parallel and have them access different L2 # tables so that the cache has a chance to get used up.
tests/qemu-iotests/036 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test qcow2 feature bits #
tests/qemu-iotests/037 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Test COW from backing files #
tests/qemu-iotests/038 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Test COW from backing files with AIO #
tests/qemu-iotests/039 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test qcow2 lazy refcounts #
tests/qemu-iotests/040 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw auto # # Tests for image block commit. #
tests/qemu-iotests/041 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw auto backing # # Tests for image mirroring. #
tests/qemu-iotests/042 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test qemu-img operation on zero size images #
tests/qemu-iotests/043 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing # # Test that qemu-img info --backing-chain detects infinite loops #
tests/qemu-iotests/044 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Tests growing a large refcount table. #
tests/qemu-iotests/045 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Tests for fdsets and getfd. #
tests/qemu-iotests/046 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto aio quick # # Test concurrent cluster allocations #
tests/qemu-iotests/047 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Regression test for commit b7ab0fea (which was a corruption fix, # despite the commit message claiming otherwise)
tests/qemu-iotests/048 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: img auto quick ## ## qemu-img compare test ##
tests/qemu-iotests/049 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Check qemu-img option parsing #
tests/qemu-iotests/050 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Test qemu-img rebase with zero clusters #
tests/qemu-iotests/051 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test command line configuration of block devices and driver-specific options #
tests/qemu-iotests/052 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Test bdrv_pread/bdrv_pwrite using BDRV_O_SNAPSHOT #
tests/qemu-iotests/053 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test qemu-img convert when image length is not a multiple of cluster size #
tests/qemu-iotests/054 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test huge qcow2 images #
tests/qemu-iotests/055 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Tests for drive-backup and blockdev-backup #
tests/qemu-iotests/056 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw backing # # Tests for drive-backup #
tests/qemu-iotests/057 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Tests for internal snapshot. #
tests/qemu-iotests/058 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test export internal snapshot by qemu-nbd, convert it by qemu-img. #
tests/qemu-iotests/059 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for vmdk #
tests/qemu-iotests/060 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for image corruption (overlapping data structures) in qcow2 #
tests/qemu-iotests/061 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test case for image option amendment in qcow2. #
tests/qemu-iotests/062 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for snapshotting images with unallocated zero clusters in # qcow2
tests/qemu-iotests/063 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # test of qemu-img convert -n - convert without creation #
tests/qemu-iotests/064 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test VHDX read/write from a sample image created with Hyper-V #
tests/qemu-iotests/065 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test for additional information emitted by qemu-img info on qcow2 # images
tests/qemu-iotests/066 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for preallocated zero clusters in qcow2 #
tests/qemu-iotests/068 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for loading a saved VM state from a qcow2 image #
tests/qemu-iotests/069 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for deleting a backing file #
tests/qemu-iotests/070 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test VHDX log replay from an image with a journal that needs to be # replayed
tests/qemu-iotests/071 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for the QMP blkdebug and blkverify interfaces #
tests/qemu-iotests/072 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for nested image formats #
tests/qemu-iotests/073 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test count_contiguous_clusters in qcow2 #
tests/qemu-iotests/074 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick ## ## qemu-img compare test (qcow2 only ones) ##
tests/qemu-iotests/075 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # cloop format input validation tests #
tests/qemu-iotests/076 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: io # # parallels format input validation tests #
tests/qemu-iotests/077 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test concurrent pread/pwrite #
tests/qemu-iotests/078 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # bochs format input validation tests #
tests/qemu-iotests/079 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test qcow2 preallocation with different cluster_sizes #
tests/qemu-iotests/080 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # qcow2 format input validation tests #
tests/qemu-iotests/081 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test Quorum block driver #
tests/qemu-iotests/082 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test qemu-img command line parsing #
tests/qemu-iotests/083 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test NBD client unexpected disconnect #
tests/qemu-iotests/084 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: img quick # # Test case for VDI header corruption; image too large, and too many blocks. # Also simple test for creating dynamic and static VDI images.
tests/qemu-iotests/085 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Live snapshot tests #
tests/qemu-iotests/086 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test qemu-img progress output #
tests/qemu-iotests/087 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test unsupported blockdev-add cases #
tests/qemu-iotests/088 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # vpc (VHD) format input validation tests #
tests/qemu-iotests/089 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for support of JSON filenames #
tests/qemu-iotests/090 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test for discarding compressed clusters on qcow2 images #
tests/qemu-iotests/091 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw migration quick # # Live migration test #
tests/qemu-iotests/092 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # qcow1 format input validation tests #
tests/qemu-iotests/093 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: throttle # # Tests for IO throttling #
tests/qemu-iotests/094 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for drive-mirror to NBD #
tests/qemu-iotests/095 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test for commit of larger active layer #
tests/qemu-iotests/096 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test that snapshots move the throttling configuration to the active # layer
tests/qemu-iotests/097 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing # # Commit changes into backing chains and empty the top image if the # backing image is not explicitly specified
tests/qemu-iotests/098 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Test qcow2's bdrv_make_empty for images without internal snapshots #
tests/qemu-iotests/099 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test valid filenames for blkdebug and blkverify representatively for # other protocols (such as NBD) when queried
tests/qemu-iotests/101 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test short file I/O #
tests/qemu-iotests/102 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for qemu-io -c map and qemu-img map #
tests/qemu-iotests/103 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for qcow2 metadata cache size specification #
tests/qemu-iotests/104 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test image creation with aligned and unaligned sizes #
tests/qemu-iotests/105 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Create, read, write big image #
tests/qemu-iotests/106 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test preallocated resize of raw images #
tests/qemu-iotests/107 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Tests updates of the qcow2 L1 table #
tests/qemu-iotests/108 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for repairing qcow2 images which cannot be repaired using # the on-disk refcount structures
tests/qemu-iotests/109 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test writing image headers of other formats into raw images #
tests/qemu-iotests/110 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Test case for relative backing file names in complex BDS trees #
tests/qemu-iotests/111 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for non-existing backing file when creating a qcow2 image # and not specifying the size
tests/qemu-iotests/112 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test cases for different refcount_bits values #
tests/qemu-iotests/113 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for accessing creation options on image formats and # protocols not supporting image creation
tests/qemu-iotests/114 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test invalid backing file format in qcow2 images #
tests/qemu-iotests/115 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test case for non-self-referential qcow2 refcount blocks #
tests/qemu-iotests/116 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test error code paths for invalid QED images #
tests/qemu-iotests/117 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test case for shared BDS between backend trees #
tests/qemu-iotests/118 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test case for the QMP 'change' command and all other associated # commands
tests/qemu-iotests/119 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # NBD test case for overriding BDRV_O_PROTOCOL by explicitly specifying # a driver
tests/qemu-iotests/120 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Non-NBD test cases for overriding BDRV_O_PROTOCOL by explicitly # specifying a driver
tests/qemu-iotests/121 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test cases for qcow2 refcount table growth #
tests/qemu-iotests/122 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test some qemu-img convert cases #
tests/qemu-iotests/123 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for qemu-img convert to NBD #
tests/qemu-iotests/124 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw backing # # Tests for incremental drive-backup #
tests/qemu-iotests/125 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test preallocated growth of qcow2 images #
tests/qemu-iotests/126 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing # # Tests handling of colons in filenames (which may be confused with protocol # prefixes)
tests/qemu-iotests/127 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Test case for mirroring with dataplane #
tests/qemu-iotests/128 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test that opening O_DIRECT succeeds when image file I/O produces EIO #
tests/qemu-iotests/129 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Tests that "bdrv_drain_all" doesn't drain block jobs #
tests/qemu-iotests/130 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test that temporary backing file overrides (on the command line or in # blockdev-add) don't replace the original path stored in the image during
tests/qemu-iotests/131 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # parallels format validation tests (created by QEMU) #
tests/qemu-iotests/132 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test mirror with unmap #
tests/qemu-iotests/133 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: auto quick # # Test for reopen #
tests/qemu-iotests/134 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test encrypted read/write using plain bdrv_pread/bdrv_pwrite #
tests/qemu-iotests/135 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test VPC open of image with large Max Table Entries value. #
tests/qemu-iotests/136 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Tests for block device statistics #
tests/qemu-iotests/137 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test qcow2 reopen #
tests/qemu-iotests/138 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # General test case for qcow2's image check #
tests/qemu-iotests/139 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test cases for the QMP 'blockdev-del' command #
tests/qemu-iotests/140 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for ejecting a BlockBackend with an NBD server attached to it #
tests/qemu-iotests/141 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for ejecting BDSs with block jobs still running on them #
tests/qemu-iotests/143 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: auto quick # # Test case for connecting to a non-existing NBD export name #
tests/qemu-iotests/144 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # Check live snapshot, followed by active commit, and another snapshot. # # This test is to catch the error case of BZ #1300209:
tests/qemu-iotests/145 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test the combination of -incoming and snapshot=on #
tests/qemu-iotests/146 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test VHD image format creator detection and override #
tests/qemu-iotests/147 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: img # # Test case for NBD's blockdev-add interface #
tests/qemu-iotests/148 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test the rate limit of QMP events #
tests/qemu-iotests/149 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw sudo # # Copyright (C) 2016 Red Hat, Inc. #
tests/qemu-iotests/150 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test that qemu-img convert -S 0 fully allocates the target image #
tests/qemu-iotests/151 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Tests for active mirroring #
tests/qemu-iotests/152 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Tests for drive-mirror with source size unaligned to granularity #
tests/qemu-iotests/153 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test image locking #
tests/qemu-iotests/154 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # qcow2 specific bdrv_pwrite_zeroes tests with backing files (complements 034) #
tests/qemu-iotests/155 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test whether the backing BDSs are correct after completion of a # mirror block job; in "existing" modes (drive-mirror with
tests/qemu-iotests/156 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Tests oVirt-like storage migration: # - Create snapshot
tests/qemu-iotests/157 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test command line configuration of block devices with qdev #
tests/qemu-iotests/158 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test encrypted read/write using backing files #
tests/qemu-iotests/159 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # qemu-img dd test with different block sizes #
tests/qemu-iotests/160 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # qemu-img dd test for the skip option #
tests/qemu-iotests/161 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test reopening a backing image after block-stream and block-commit #
tests/qemu-iotests/162 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test case for specifying runtime options of the wrong type to some # block drivers
tests/qemu-iotests/163 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Tests for shrinking images #
tests/qemu-iotests/165 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Tests for persistent dirty bitmaps. #
tests/qemu-iotests/169 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw migration # # Tests for dirty bitmaps migration. #
tests/qemu-iotests/170 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # qemu-img dd test #
tests/qemu-iotests/171 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test 'offset' and 'size' options of the raw driver. Make sure we can't # (or can) read and write outside of the image size.
tests/qemu-iotests/172 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: auto # # Test floppy configuration #
tests/qemu-iotests/173 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test QAPI commands looking up protocol based images with relative # filename backing strings
tests/qemu-iotests/174 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: auto # # Test that qemu-io fail with non-zero exit code #
tests/qemu-iotests/175 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test creating raw image preallocation mode #
tests/qemu-iotests/176 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing # # Commit changes into backing chains and empty the top image if the # backing image is not explicitly specified.
tests/qemu-iotests/177 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test corner cases with unusual block geometries #
tests/qemu-iotests/178 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: img # # qemu-img measure sub-command tests #
tests/qemu-iotests/179 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test case for write zeroes with unmap #
tests/qemu-iotests/181 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto migration quick # # Test postcopy live migration with shared storage #
tests/qemu-iotests/182 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test image locking for POSIX locks #
tests/qemu-iotests/183 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw migration quick # # Test old-style block migration (migrate -b) #
tests/qemu-iotests/184 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test I/O throttle block filter driver interface #
tests/qemu-iotests/185 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test exiting qemu while jobs are still running #
tests/qemu-iotests/186 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test 'info block' with all kinds of configurations #
tests/qemu-iotests/187 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test switching between read-only and read-write #
tests/qemu-iotests/188 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test encrypted read/write using plain bdrv_pread/bdrv_pwrite #
tests/qemu-iotests/189 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test encrypted read/write using backing files #
tests/qemu-iotests/190 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # qemu-img measure sub-command tests on huge qcow2 files #
tests/qemu-iotests/191 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test commit block job where top has two parents #
tests/qemu-iotests/192 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test NBD export with -incoming (non-shared storage migration use case from # libvirt)
tests/qemu-iotests/194 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw migration quick # # Copyright (C) 2017 Red Hat, Inc. #
tests/qemu-iotests/195 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test change-backing-file command #
tests/qemu-iotests/196 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick migration # # Test clearing unknown autoclear_features flag by qcow2 after # migration. This test mimics migration to older qemu.
tests/qemu-iotests/197 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for copy-on-read into qcow2 #
tests/qemu-iotests/198 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test commit of encrypted qcow2 files #
tests/qemu-iotests/199 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw migration # # Tests for dirty bitmaps postcopy migration. #
tests/qemu-iotests/200 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Block job co-routine race condition test. #
tests/qemu-iotests/201 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw migration quick # # Test savevm and loadvm after live migration with postcopy flag #
tests/qemu-iotests/202 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Copyright (C) 2017 Red Hat, Inc. #
tests/qemu-iotests/203 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw auto migration quick # # Copyright (C) 2017 Red Hat, Inc. #
tests/qemu-iotests/204 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test corner cases with unusual block geometries #
tests/qemu-iotests/205 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Tests for qmp command nbd-server-remove. #
tests/qemu-iotests/206 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test qcow2 and file image creation #
tests/qemu-iotests/207 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test ssh image creation #
tests/qemu-iotests/208 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Copyright (C) 2018 Red Hat, Inc. #
tests/qemu-iotests/209 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Tests for NBD BLOCK_STATUS extension #
tests/qemu-iotests/210 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test luks and file image creation #
tests/qemu-iotests/211 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test VDI and file image creation #
tests/qemu-iotests/212 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test parallels and file image creation #
tests/qemu-iotests/213 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test vhdx and file image creation #
tests/qemu-iotests/214 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test qcow2 image compression #
tests/qemu-iotests/215 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for copy-on-read into qcow2, using the COR filter driver #
tests/qemu-iotests/216 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Copy-on-read tests using a COR filter node #
tests/qemu-iotests/217 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # I/O errors when working with internal qcow2 snapshots, and repairing # the result
tests/qemu-iotests/218 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # This test covers what happens when a mirror block job is cancelled # in various phases of its existence.
tests/qemu-iotests/219 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Copyright (C) 2018 Red Hat, Inc. #
tests/qemu-iotests/220 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # max limits on compression in huge qcow2 files #
tests/qemu-iotests/221 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test qemu-img vs. unaligned images # (See also 253, which is the O_DIRECT version)
tests/qemu-iotests/222 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # This test covers the basic fleecing workflow, which provides a # point-in-time snapshot of a node that can be queried over NBD.
tests/qemu-iotests/223 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test reading dirty bitmap over NBD #
tests/qemu-iotests/224 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test json:{} filenames with qemu-internal BDSs # (the one of commit, to be precise)
tests/qemu-iotests/225 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test vmdk backing file correlation #
tests/qemu-iotests/226 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: auto quick # # This test covers expected filetypes for the file, host_cdrom and # host_device drivers.
tests/qemu-iotests/227 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test query-blockstats with different ways to create a BB #
tests/qemu-iotests/228 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test for when a backing file is considered overridden (thus, a # json:{} filename is generated for the overlay) and when it is not
tests/qemu-iotests/229 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: auto quick # # Test for force canceling a running blockjob that is paused in # an error state.
tests/qemu-iotests/231 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test legacy and modern option parsing for rbd/ceph. This will not # actually connect to a ceph server, but rather looks for the appropriate
tests/qemu-iotests/232 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test for auto-read-only #
tests/qemu-iotests/233 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # Test NBD TLS certificate / authorization integration #
tests/qemu-iotests/234 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: quick migration # # Copyright (C) 2018 Red Hat, Inc. #
tests/qemu-iotests/235 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: quick # # Simple mirror test #
tests/qemu-iotests/236 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: quick # # Test bitmap merges. #
tests/qemu-iotests/237 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test vmdk and file image creation #
tests/qemu-iotests/238 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: quick # # Regression test for throttle group member unregister segfault with iothread #
tests/qemu-iotests/239 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test case for dmg #
tests/qemu-iotests/240 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: quick # Test hot plugging and unplugging with iothreads #
tests/qemu-iotests/241 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test qemu-nbd vs. unaligned images #
tests/qemu-iotests/242 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test for qcow2 bitmap printed information #
tests/qemu-iotests/243 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test qcow2 preallocation #
tests/qemu-iotests/244 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test qcow2 with external data files #
tests/qemu-iotests/245 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test cases for the QMP 'x-blockdev-reopen' command #
tests/qemu-iotests/246 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test persistent bitmap resizing. #
tests/qemu-iotests/247 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test for auto-read-only with commit block job #
tests/qemu-iotests/248 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test resume mirror after auto pause on ENOSPC #
tests/qemu-iotests/249 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test that a backing image is put back in read-only mode after # block-commit (both when it fails and when it succeeds).
tests/qemu-iotests/250 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test big discard in qcow2 shrink #
tests/qemu-iotests/251 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test qemu-img convert --salvage #
tests/qemu-iotests/252 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto backing quick # # Tests for rebasing COW images that require zero cluster support #
tests/qemu-iotests/253 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test qemu-img vs. unaligned images; O_DIRECT version # (Originates from 221)
tests/qemu-iotests/254 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw backing quick # # Test external snapshot with bitmap copying and moving. #
tests/qemu-iotests/255 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test commit job graph modifications while requests are active #
tests/qemu-iotests/256 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw auto quick # # Test incremental/backup across iothread contexts #
tests/qemu-iotests/257 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test bitmap-sync backups (incremental, differential, and partials) #
tests/qemu-iotests/258 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Very specific tests for adjacent commit/stream block jobs #
tests/qemu-iotests/259 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test generic image creation fallback (by using NBD) #
tests/qemu-iotests/260 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Tests for temporary external snapshot when we have bitmaps. #
tests/qemu-iotests/261 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test case for qcow2's handling of extra data in snapshot table entries # (and more generally, how certain cases of broken snapshot tables are
tests/qemu-iotests/262 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick migration # # Copyright (C) 2019 Red Hat, Inc. #
tests/qemu-iotests/263 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test encrypted write that crosses cluster boundary of two unallocated clusters # Based on 188
tests/qemu-iotests/264 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test nbd reconnect #
tests/qemu-iotests/265 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test reverse-ordered qcow2 writes on a sub-cluster level #
tests/qemu-iotests/266 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test VPC and file image creation #
tests/qemu-iotests/267 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick snapshot # # Test which nodes are involved in internal snapshots #
tests/qemu-iotests/268 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test write request with required alignment larger than the cluster size #
tests/qemu-iotests/270 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw backing quick # # Test large write to a qcow2 image #
tests/qemu-iotests/271 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto # # Test qcow2 images with extended L2 entries #
tests/qemu-iotests/272 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test compressed write to a qcow2 image at an offset above 4 GB #
tests/qemu-iotests/273 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: backing quick # # Test multiple blockdev-snapshot calls with 'backing': null #
tests/qemu-iotests/274 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw backing # # Copyright (C) 2019 Red Hat, Inc. #
tests/qemu-iotests/277 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test NBD client reconnection #
tests/qemu-iotests/279 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw backing quick # # Test qemu-img --backing-chain --image-opts #
tests/qemu-iotests/280 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw migration quick # # Copyright (C) 2019 Red Hat, Inc. #
tests/qemu-iotests/281 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test cases for blockdev + IOThread interactions #
tests/qemu-iotests/282 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw img quick # # Test qemu-img file cleanup for LUKS when using a non-UTF8 secret #
tests/qemu-iotests/283 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: auto quick # # Test for backup-top filter permission activation failure #
tests/qemu-iotests/284 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test ref count checks on encrypted images #
tests/qemu-iotests/286 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test qemu-img snapshot -l #
tests/qemu-iotests/287 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: auto quick # # Test case for an image using zstd compression #
tests/qemu-iotests/288 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: quick # # qemu-img measure tests for LUKS images #
tests/qemu-iotests/289 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # qcow2 v3-exclusive error path testing # (026 tests paths common to v2 and v3)
tests/qemu-iotests/290 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test how 'qemu-io -c discard' behaves on v2 and v3 qcow2 images #
tests/qemu-iotests/291 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test qemu-img bitmap handling #
tests/qemu-iotests/292 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test resizing a qcow2 image with a backing file #
tests/qemu-iotests/293 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test encryption key management with luks # Based on 134
tests/qemu-iotests/294 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Copyright (C) 2019 Red Hat, Inc. #
tests/qemu-iotests/295 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test case QMP's encrypted key management #
tests/qemu-iotests/296 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw # # Test case for encryption key management versus image sharing #
tests/qemu-iotests/297 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: meta # # Copyright (C) 2020 Red Hat, Inc. #
tests/qemu-iotests/299 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: auto quick # # Test shutdown when bitmap is exported through NBD server #
tests/qemu-iotests/300 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: migration # # Copyright (C) 2020 Red Hat, Inc. #
tests/qemu-iotests/301 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: backing quick # # Test qcow backing file warnings #
tests/qemu-iotests/302 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: quick # # Tests converting qcow2 compressed to NBD #
tests/qemu-iotests/303 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Test for dumping of qcow2 image metadata #
tests/qemu-iotests/304 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick # # Tests dirty-bitmap backup with unaligned bitmap granularity #
tests/qemu-iotests/305 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test the handling of errors in write requests with multiple allocations #
tests/qemu-iotests/307 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# group: rw quick export # # Copyright (C) 2020 Red Hat, Inc. #
tests/qemu-iotests/308 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw # # Test FUSE exports (in ways that are not captured by the generic # tests)
tests/qemu-iotests/309 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw auto quick # # Test qemu-nbd -A #
tests/qemu-iotests/312 +1 -0
@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test drive-mirror with quorum #
Signature · 1 line
2.29.2
Re: [PATCH v6 06/11] iotests: define group in each iotest
Quoted 14 lines · Vladimir Sementsov-Ogievskiy
We are going to drop group file. Define group in tests as a preparatory step.
The patch is generated by
cd tests/qemu-iotests grep '^[0-9]\{3\} ' group | while read line; do file=$(awk '{print $1}' <<< "$line"); groups=$(sed -e 's/^... //' <<< "$line"); awk "NR==2{print \"# group: $groups\"}1" $file > tmp; cat tmp > $file; done
Quoted 4 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
291 files changed, 291 insertions(+)
May need rebasing, but your reproduction formula works (requires bash, but that's fine since the tests themselves do as well).
tests/qemu-iotests/312 line 5
Quoted 7 lines
+++ b/tests/qemu-iotests/312
tests/qemu-iotests/312 +1
-0@@ -1,4 +1,5 @@ #!/usr/bin/env bash +# group: rw quick # # Test drive-mirror with quorum #
I like how it looks.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v6 7/11 iotests: add findtests.py
In reply to Vladimir Sementsov-OgievskiyAdd python script with new logic of searching for tests:
Current ./check behavior:
- tests are named [0-9][0-9][0-9]
- tests must be registered in group file (even if test doesn't belong to any group, like 142)
Behavior of findtests.py:
- group file is dropped
- tests are all files in tests/ subdirectory (except for .out files), so it's not needed more to "register the test", just create it with appropriate name in tests/ subdirectory. Old names like [0-9][0-9][0-9] (in root iotests directory) are supported too, but not recommended for new tests
- groups are parsed from '# group: ' line inside test files
- optional file group.local may be used to define some additional groups for downstreams
- 'disabled' group is used to temporary disable tests. So instead of commenting tests in old 'group' file you now can add them to disabled group with help of 'group.local' file
- selecting test ranges like 5-15 are not supported more (to support restarting failed ./check command from the middle of the process, new argument is added: --start-from)
Benefits:
- no rebase conflicts in group file on patch porting from branch to branch
- no conflicts in upstream, when different series want to occupy same test number
- meaningful names for test files
For example, with digital number, when some person wants to add some test about block-stream, he most probably will just create a new test. But if there would be test-block-stream test already, he will at first look at it and may be just add a test-case into it. And anyway meaningful names are better.
This commit don't update check behavior (which will be don in further commit), still, the documentation changed like new behavior is already here. Let's live with this small inconsistency for the following few commits, until final change.
The file findtests.py is self-executable and may be used for debugging purposes.
--- docs/devel/testing.rst | 50 ++++++- tests/qemu-iotests/findtests.py | 229 ++++++++++++++++++++++++++++++++ 2 files changed, 278 insertions(+), 1 deletion(-) create mode 100755 tests/qemu-iotests/findtests.py
docs/devel/testing.rst +49 -1
@@ -111,7 +111,7 @@ check-block ----------- ``make check-block`` runs a subset of the block layer iotests (the tests that -are in the "auto" group in ``tests/qemu-iotests/group``). +are in the "auto" group). See the "QEMU iotests" section below for more information. GCC gcov support
@@ -224,6 +224,54 @@ another application on the host may have locked the file, possibly leading to a test failure. If using such devices are explicitly desired, consider adding ``locking=off`` option to disable image locking. +Test case groups +---------------- + +Test may belong to some groups, you may define it in the comment inside the +test. By convention, test groups are listed in the second line of the test +file, after "#!/..." line, like this: + +.. code:: + + #!/usr/bin/env python3 + # group: auto quick + # + ... + +Additional way of defining groups is creating tests/qemu-iotests/group.local +file. This should be used only for downstream (this file should never appear +in upstream). This file may be used for defining some downstream test groups +or for temporary disable tests, like this: + +.. code:: + + # groups for some company downstream process + # + # ci - tests to run on build + # down - our downstream tests, not for upstream + # + # Format of each line is: + # TEST_NAME TEST_GROUP [TEST_GROUP ]... + + 013 ci + 210 disabled + 215 disabled + our-ugly-workaround-test down ci + +The (not exhaustive) list of groups: + +- quick : Tests in this group should finish within some few seconds. + +- auto : Tests in this group are used during "make check" and should be + runnable in any case. That means they should run with every QEMU binary + (also non-x86), with every QEMU configuration (i.e. must not fail if + an optional feature is not compiled in - but reporting a "skip" is ok), + work at least with the qcow2 file format, work with all kind of host + filesystems and users (e.g. "nobody" or "root") and must not take too + much memory and disk space (since CI pipelines tend to fail otherwise). + +- disabled : Tests in this group are disabled and ignored by check. + .. _docker-ref: Docker based tests
tests/qemu-iotests/findtests.py new file +229 -0
229 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH v6 07/11] iotests: add findtests.py
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 41 lines
Add python script with new logic of searching for tests:
Current ./check behavior:
- tests are named [0-9][0-9][0-9]
- tests must be registered in group file (even if test doesn't belong to any group, like 142)Behavior of
findtests.py:
- group file is dropped
- tests are all files in tests/ subdirectory (except for .out files), so it's not needed more to "register the test", just create it with appropriate name in tests/ subdirectory. Old names like [0-9][0-9][0-9] (in root iotests directory) are supported too, but not recommended for new tests
- groups are parsed from '# group: ' line inside test files
- optional file group.local may be used to define some additional groups for downstreams
- 'disabled' group is used to temporary disable tests. So instead of commenting tests in old 'group' file you now can add them to disabled group with help of 'group.local' file
- selecting test ranges like 5-15 are not supported more (to support restarting failed ./check command from the middle of the process, new argument is added: --start-from)Benefits:
- no rebase conflicts in group file on patch porting from branch to branch
- no conflicts in upstream, when different series want to occupy same test number
- meaningful names for test files
For example, with digital number, when some person wants to add some test about block-stream, he most probably will just create a new test. But if there would be test-block-stream test already, he will at first look at it and may be just add a test-case into it. And anyway meaningful names are better.This commit don't update check behavior (which will be don in further commit), still, the documentation changed like new behavior is already here. Let's live with this small inconsistency for the following few commits, until final change.
Quoted 7 lines
The file
findtests.pyis self-executable and may be used for debugging purposes.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- docs/devel/testing.rst | 50 ++++++- tests/qemu-iotests/findtests.py | 229 ++++++++++++++++++++++++++++++++
I extended 297 so that it also checks the newly added Python file, and pylint and mypy report some errors:
+************* Module findtests
+findtests.py:127:19: W0621: Redefining name 'tests' from outer scope (line 226) (redefined-outer-name) +findtests.py:224:8: R1722: Consider using sys.exit() (consider-using-sys-exit) +findtests.py:32: error: Missing type parameters for generic type "Iterator" +findtests.py:87: error: Function is missing a return type annotation +findtests.py:206: error: Function is missing a type annotation for one or more arguments
I would suggest including a final patch in this series that adds all new Python files to the checking in 297.
Quoted 14 lines
docs/devel/testing.rst +1
-1@@ -111,7 +111,7 @@ check-block ----------- ``make check-block`` runs a subset of the block layer iotests (the tests that -are in the "auto" group in ``tests/qemu-iotests/group``). +are in the "auto" group). See the "QEMU iotests" section below for more information. GCC gcov support
docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 231
Quoted 8 lines
docs/devel/testing.rst +5
-0@@ -224,6 +224,54 @@ another application on the host may have locked the file, possibly leading to a test failure. If using such devices are explicitly desired, consider adding ``locking=off`` option to disable image locking. +Test case groups +---------------- + +Test may belong to some groups, you may define it in the comment inside the +test.
Maybe: "Tests may belong to one or more test groups, which are defined in the form of a comment in the test source file."
docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 233
Quoted 2 lines
docs/devel/testing.rst +1
-0By convention, test groups are listed in the second line of the test +file, after "#!/..." line, like this:
"after the "#!/..." line"
docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 241
Quoted 9 lines
docs/devel/testing.rst +9
-0+ +.. code:: + + #!/usr/bin/env python3 + # group: auto quick + # + ... + +Additional way of defining groups is creating tests/qemu-iotests/group.local
"An additional" or "Another".
"creating the ... file"
docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 244
Quoted 3 lines
docs/devel/testing.rst +3
-0+file. This should be used only for downstream (this file should never appear +in upstream). This file may be used for defining some downstream test groups +or for temporary disable tests, like this:
"disabling"
Quoted 7 lines
docs/devel/testing.rst +7
-0+ +.. code:: + + # groups for some company downstream process + # + # ci - tests to run on build + # down - our downstream tests, not for upstream
docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 261
Quoted 10 lines
docs/devel/testing.rst +10
-0+ # + # Format of each line is: + # TEST_NAME TEST_GROUP [TEST_GROUP ]... + + 013 ci + 210 disabled + 215 disabled + our-ugly-workaround-test down ci + +The (not exhaustive) list of groups:
Maybe just something like this?
"Note that the following group names have a special meaning:"
Quoted 44 lines
docs/devel/testing.rst +13
-0+ +- quick : Tests in this group should finish within some few seconds. + +- auto : Tests in this group are used during "make check" and should be + runnable in any case. That means they should run with every QEMU binary + (also non-x86), with every QEMU configuration (i.e. must not fail if + an optional feature is not compiled in - but reporting a "skip" is ok), + work at least with the qcow2 file format, work with all kind of host + filesystems and users (e.g. "nobody" or "root") and must not take too + much memory and disk space (since CI pipelines tend to fail otherwise). + +- disabled : Tests in this group are disabled and ignored by check. + .. _docker-ref:Docker based tests
tests/qemu-iotests/findtests.py new file +22
-0@@ -0,0 +1,229 @@ +#!/usr/bin/env python3 +# +# Parse command line options to define set of tests to run. +# +# Copyright (c) 2020 Virtuozzo International GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import os +import sys
tests/qemu-iotests/findtests.py line 32
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+import glob +import argparse +import re +from collections import defaultdict +from contextlib import contextmanager +from typing import Optional, List, Tuple, Iterator, Set + + +@contextmanager +def chdir(path: Optional[str] = None) -> Iterator:
As indicated by mypy, this should be Interator[None].
Quoted 43 lines
tests/qemu-iotests/findtests.py new file +43
-0+ if path is None: + yield + return + + saved_dir = os.getcwd() + os.chdir(path) + try: + yield + finally: + os.chdir(saved_dir) + + +class TestFinder: + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser + + p = argparse.ArgumentParser(description="= test selecting options =", + add_help=False, usage=argparse.SUPPRESS) + + p.add_argument('-g', '--groups', metavar='group1,...', + help='include tests from these groups') + p.add_argument('-x', '--exclude-groups', metavar='group1,...', + help='exclude tests from these groups') + p.add_argument('--start-from', metavar='TEST', + help='Start from specified test: make sorted sequence ' + 'of tests as usual and then drop tests from the first ' + 'one to TEST (not inclusive). This may be used to ' + 'rerun failed ./check command, starting from the ' + 'middle of the process.') + p.add_argument('tests', metavar='TEST_FILES', nargs='*', + help='tests to run') + + cls._argparser = p + return p + + def __init__(self, test_dir: Optional[str] = None) -> None: + self.groups = defaultdict(set) + + with chdir(test_dir): + self.all_tests = glob.glob('[0-9][0-9][0-9]')
tests/qemu-iotests/findtests.py line 85
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+ self.all_tests += [f for f in glob.iglob('tests/*') + if not f.endswith('.out') and + os.path.isfile(f + '.out')] + + for t in self.all_tests: + with open(t) as f: + for line in f: + if line.startswith('# group: '): + for g in line.split()[2:]: + self.groups[g].add(t)
Do we need to allow more than one group comment in a test or could we return early here, avoiding to read the whole file?
Quoted 7 lines
tests/qemu-iotests/findtests.py new file +7
-0+ + def add_group_file(self, fname: str): + with open(fname) as f: + for line in f: + line = line.strip() + + if (not line) or line[0] == '#':
tests/qemu-iotests/findtests.py line 102
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+ continue + + words = line.split() + test_file = words[0] + groups = words[1:] + + if test_file not in self.all_tests: + print(f'Warning: {fname}: "{test_file}" test is not found.' + ' Skip.') + continue
Should test_file be passed through parse_test_name()? I noticed that I have to explicitly specify a tests/ prefix in group.local, whereas prefixing this on the command line seems to be forbidden.
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+ for g in groups: + self.groups[g].add(test_file) + + def parse_test_name(self, name: str) -> str: + if '/' in name: + raise ValueError('Paths are unsupported for test selecting, ' + f'requiring "{name}" is wrong') + + if re.fullmatch(r'\d+', name): + # Numbered tests are old naming convetion. We should convert them
tests/qemu-iotests/findtests.py line 123
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+ # to three-digit-length, like 1 --> 001. + name = f'{int(name):03}' + else: + # Named tests all should be in tests/ subdirectory + name = os.path.join('tests', name) + + if name not in self.all_tests: + raise ValueError(f'Test "{name}" is not found') + + return name
check should probably catch these ValueError exceptions. Currently, you get a stack trace, which does include the exception message, but it doesn't look very nice.
tests/qemu-iotests/findtests.py line 127
Quoted 3 lines
tests/qemu-iotests/findtests.py new file +3
-0+ def find_tests(self, groups: Optional[List[str]] = None, + exclude_groups: Optional[List[str]] = None, + tests: Optional[List[str]] = None,
group and tests seem to be read-only, so this can be simplified to 'groups: Sequence[str] = ()' etc. without the explicit handling of None below.
Maybe exclude_groups should then be treated the same for consistency. This would mean creating a new list instead of calling .append().
Quoted 92 lines
tests/qemu-iotests/findtests.py new file +92
-0+ start_from: Optional[str] = None) -> List[str]: + """Find tests + + Algorithm: + + 1. a. if some @groups specified + a.1 Take all tests from @groups + a.2 Drop tests, which are in at least one of @exclude_groups or in + 'disabled' group (if 'disabled' is not listed in @groups) + a.3 Add tests from @tests (don't exclude anything from them) + + b. else, if some @tests specified: + b.1 exclude_groups must be not specified, so just take @tests + + c. else (only @exclude_groups list is non-empty): + c.1 Take all tests + c.2 Drop tests, which are in at least one of @exclude_groups or in + 'disabled' group + + 2. sort + + 3. If start_from specified, drop tests from first one to @start_from + (not inclusive) + """ + if groups is None: + groups = [] + if exclude_groups is None: + exclude_groups = [] + if tests is None: + tests = [] + + res: Set[str] = set() + if groups: + # Some groups specified. exclude_groups supported, additionally + # selecting some individual tests supported as well. + res.update(*(self.groups[g] for g in groups)) + elif tests: + # Some individual tests specified, but no groups. In this case + # we don't support exclude_groups. + if exclude_groups: + raise ValueError("Can't exclude from individually specified " + "tests.") + else: + # No tests no groups: start from all tests, exclude_groups + # supported. + res.update(self.all_tests) + + if 'disabled' not in groups and 'disabled' not in exclude_groups: + exclude_groups.append('disabled') + + res = res.difference(*(self.groups[g] for g in exclude_groups)) + + # We want to add @tests. But for compatibility with old test names, + # we should convert any number < 100 to number padded by + # leading zeroes, like 1 -> 001 and 23 -> 023. + for t in tests: + res.add(self.parse_test_name(t)) + + sequence = sorted(res) + + if start_from is not None: + del sequence[:sequence.index(self.parse_test_name(start_from))] + + return sequence + + def find_tests_argv(self, argv: List[str]) -> Tuple[List[str], List[str]]: + """Returns tuple of tests list and remaining arguments list""" + args, remaining = self.get_argparser().parse_known_args(argv) + + if args.groups is not None: + args.groups = args.groups.split(',') + + if args.exclude_groups is not None: + args.exclude_groups = args.exclude_groups.split(',') + + return self.find_tests(**vars(args)), remaining + + +def find_tests(argv, test_dir: Optional[str] = None) -> Tuple[List[str], + List[str]]: + """Returns tuple of tests list and remaining arguments list""" + tf = TestFinder(test_dir) + + if test_dir is None: + group_local = 'group.local' + else: + group_local = os.path.join(test_dir, 'group.local') + if os.path.isfile(group_local): + tf.add_group_file(group_local) + + return tf.find_tests_argv(argv) +
tests/qemu-iotests/findtests.py line 229
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+ +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: + TestFinder.get_argparser().print_help() + exit() + + tests, remaining_argv = find_tests(sys.argv[1:]) + print('\n'.join(tests)) + if remaining_argv: + print('\nUnhandled options: ', remaining_argv)
Kevin
Re: [PATCH v6 07/11] iotests: add findtests.py
Quoted 240 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 41 lines
Add python script with new logic of searching for tests:
Current ./check behavior:
- tests are named [0-9][0-9][0-9]
- tests must be registered in group file (even if test doesn't belong to any group, like 142)Behavior of
findtests.py:
- group file is dropped
- tests are all files in tests/ subdirectory (except for .out files), so it's not needed more to "register the test", just create it with appropriate name in tests/ subdirectory. Old names like [0-9][0-9][0-9] (in root iotests directory) are supported too, but not recommended for new tests
- groups are parsed from '# group: ' line inside test files
- optional file group.local may be used to define some additional groups for downstreams
- 'disabled' group is used to temporary disable tests. So instead of commenting tests in old 'group' file you now can add them to disabled group with help of 'group.local' file
- selecting test ranges like 5-15 are not supported more (to support restarting failed ./check command from the middle of the process, new argument is added: --start-from)Benefits:
- no rebase conflicts in group file on patch porting from branch to branch
- no conflicts in upstream, when different series want to occupy same test number
- meaningful names for test files
For example, with digital number, when some person wants to add some test about block-stream, he most probably will just create a new test. But if there would be test-block-stream test already, he will at first look at it and may be just add a test-case into it. And anyway meaningful names are better.This commit don't update check behavior (which will be don in further commit), still, the documentation changed like new behavior is already here. Let's live with this small inconsistency for the following few commits, until final change.
Quoted 7 lines
The file
findtests.pyis self-executable and may be used for debugging purposes.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- docs/devel/testing.rst | 50 ++++++- tests/qemu-iotests/findtests.py | 229 ++++++++++++++++++++++++++++++++I extended 297 so that it also checks the newly added Python file, and pylint and mypy report some errors:
(quoted diff) +6
-0+************* Module findtests +findtests.py:127:19: W0621: Redefining name 'tests' from outer scope (line 226) (redefined-outer-name) +findtests.py:224:8: R1722: Consider using sys.exit() (consider-using-sys-exit) +findtests.py:32: error: Missing type parameters for generic type "Iterator" +findtests.py:87: error: Function is missing a return type annotation +findtests.py:206: error: Function is missing a type annotation for one or more argumentsI would suggest including a final patch in this series that adds all new Python files to the checking in 297.
Quoted 14 lines
docs/devel/testing.rst +1
-1@@ -111,7 +111,7 @@ check-block ----------- ``make check-block`` runs a subset of the block layer iotests (the tests that -are in the "auto" group in ``tests/qemu-iotests/group``). +are in the "auto" group). See the "QEMU iotests" section below for more information. GCC gcov supportdocs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 231
Quoted 8 lines
docs/devel/testing.rst +5
-0@@ -224,6 +224,54 @@ another application on the host may have locked the file, possibly leading to a test failure. If using such devices are explicitly desired, consider adding ``locking=off`` option to disable image locking. +Test case groups +---------------- + +Test may belong to some groups, you may define it in the comment inside the +test.Maybe: "Tests may belong to one or more test groups, which are defined in the form of a comment in the test source file."
docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 233
Quoted 2 lines
docs/devel/testing.rst +1
-0By convention, test groups are listed in the second line of the test +file, after "#!/..." line, like this:"after the "#!/..." line"
docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 241
Quoted 9 lines
docs/devel/testing.rst +9
-0+ +.. code:: + + #!/usr/bin/env python3 + # group: auto quick + # + ... + +Additional way of defining groups is creating tests/qemu-iotests/group.local"An additional" or "Another".
"creating the ... file"docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 244
Quoted 3 lines
docs/devel/testing.rst +3
-0+file. This should be used only for downstream (this file should never appear +in upstream). This file may be used for defining some downstream test groups +or for temporary disable tests, like this:"disabling"
Quoted 7 lines
docs/devel/testing.rst +7
-0+ +.. code:: + + # groups for some company downstream process + # + # ci - tests to run on build + # down - our downstream tests, not for upstreamdocs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 261
Quoted 10 lines
docs/devel/testing.rst +10
-0+ # + # Format of each line is: + # TEST_NAME TEST_GROUP [TEST_GROUP ]... + + 013 ci + 210 disabled + 215 disabled + our-ugly-workaround-test down ci + +The (not exhaustive) list of groups:Maybe just something like this?
"Note that the following group names have a special meaning:"
Quoted 44 lines
docs/devel/testing.rst +13
-0+ +- quick : Tests in this group should finish within some few seconds. + +- auto : Tests in this group are used during "make check" and should be + runnable in any case. That means they should run with every QEMU binary + (also non-x86), with every QEMU configuration (i.e. must not fail if + an optional feature is not compiled in - but reporting a "skip" is ok), + work at least with the qcow2 file format, work with all kind of host + filesystems and users (e.g. "nobody" or "root") and must not take too + much memory and disk space (since CI pipelines tend to fail otherwise). + +- disabled : Tests in this group are disabled and ignored by check. + .. _docker-ref:Docker based tests
tests/qemu-iotests/findtests.py new file +22
-0@@ -0,0 +1,229 @@ +#!/usr/bin/env python3 +# +# Parse command line options to define set of tests to run. +# +# Copyright (c) 2020 Virtuozzo International GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import os +import systests/qemu-iotests/findtests.py line 32
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+import glob +import argparse +import re +from collections import defaultdict +from contextlib import contextmanager +from typing import Optional, List, Tuple, Iterator, Set + + +@contextmanager +def chdir(path: Optional[str] = None) -> Iterator:As indicated by mypy, this should be Interator[None].
Quoted 48 lines
tests/qemu-iotests/findtests.py new file +48
-0+ if path is None: + yield + return + + saved_dir = os.getcwd() + os.chdir(path) + try: + yield + finally: + os.chdir(saved_dir) + + +class TestFinder: + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser + + p = argparse.ArgumentParser(description="= test selecting options =", + add_help=False, usage=argparse.SUPPRESS) + + p.add_argument('-g', '--groups', metavar='group1,...', + help='include tests from these groups') + p.add_argument('-x', '--exclude-groups', metavar='group1,...', + help='exclude tests from these groups') + p.add_argument('--start-from', metavar='TEST', + help='Start from specified test: make sorted sequence ' + 'of tests as usual and then drop tests from the first ' + 'one to TEST (not inclusive). This may be used to ' + 'rerun failed ./check command, starting from the ' + 'middle of the process.') + p.add_argument('tests', metavar='TEST_FILES', nargs='*', + help='tests to run') + + cls._argparser = p + return p + + def __init__(self, test_dir: Optional[str] = None) -> None: + self.groups = defaultdict(set) + + with chdir(test_dir): + self.all_tests = glob.glob('[0-9][0-9][0-9]') + self.all_tests += [f for f in glob.iglob('tests/*') + if not f.endswith('.out') and + os.path.isfile(f + '.out')] + + for t in self.all_tests:
Quoted 8 lines
tests/qemu-iotests/findtests.py line 85
Quoted 5 lines
tests/qemu-iotests/findtests.py new file +5
-0+ with open(t) as f: + for line in f: + if line.startswith('# group: '): + for g in line.split()[2:]: + self.groups[g].add(t)Do we need to allow more than one group comment in a test or could we return early here, avoiding to read the whole file?
Hmm, if we defined it's as a "convention", I think we can just check only the second line of the file.
Quoted 14 lines
Quoted 14 lines
tests/qemu-iotests/findtests.py new file +13
-0+ + def add_group_file(self, fname: str): + with open(fname) as f: + for line in f: + line = line.strip() + + if (not line) or line[0] == '#': + continue + + words = line.split() + test_file = words[0] + groups = words[1:] +
Quoted 8 lines
tests/qemu-iotests/findtests.py line 102
Quoted 4 lines
tests/qemu-iotests/findtests.py new file +4
-0+ if test_file not in self.all_tests: + print(f'Warning: {fname}: "{test_file}" test is not found.' + ' Skip.') + continueShould
test_filebe passed throughparse_test_name()? I noticed that I have to explicitly specify a tests/ prefix in group.local, whereas prefixing this on the command line seems to be forbidden.
agree.
Quoted 30 lines
Quoted 11 lines
tests/qemu-iotests/findtests.py new file +10
-0+ for g in groups: + self.groups[g].add(test_file) + + def parse_test_name(self, name: str) -> str: + if '/' in name: + raise ValueError('Paths are unsupported for test selecting, ' + f'requiring "{name}" is wrong') + + if re.fullmatch(r'\d+', name): + # Numbered tests are old naming convetion. We should convert themtests/qemu-iotests/findtests.py line 123
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+ # to three-digit-length, like 1 --> 001. + name = f'{int(name):03}' + else: + # Named tests all should be in tests/ subdirectory + name = os.path.join('tests', name) + + if name not in self.all_tests: + raise ValueError(f'Test "{name}" is not found') + + return namecheck should probably catch these ValueError exceptions. Currently, you get a stack trace, which does include the exception message, but it doesn't look very nice.
tests/qemu-iotests/findtests.py line 127
Quoted 3 lines
tests/qemu-iotests/findtests.py new file +3
-0+ def find_tests(self, groups: Optional[List[str]] = None, + exclude_groups: Optional[List[str]] = None, + tests: Optional[List[str]] = None,
Quoted 6 lines
group and tests seem to be read-only, so this can be simplified to 'groups: Sequence[str] = ()' etc. without the explicit handling of None below.
Maybe
exclude_groupsshould then be treated the same for consistency. This would mean creating a new list instead of calling .append().
will try.
thanks, I'll take all the suggestions.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 07/11] iotests: add findtests.py
Am 13.01.2021 um 11:37 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 21 lines
Quoted 11 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 10 lines
tests/qemu-iotests/findtests.py new file +10
-0+ def __init__(self, test_dir: Optional[str] = None) -> None: + self.groups = defaultdict(set) + + with chdir(test_dir): + self.all_tests = glob.glob('[0-9][0-9][0-9]') + self.all_tests += [f for f in glob.iglob('tests/*') + if not f.endswith('.out') and + os.path.isfile(f + '.out')] + + for t in self.all_tests:Quoted 8 lines
tests/qemu-iotests/findtests.py line 85
Quoted 5 lines
tests/qemu-iotests/findtests.py new file +5
-0+ with open(t) as f: + for line in f: + if line.startswith('# group: '): + for g in line.split()[2:]: + self.groups[g].add(t)Do we need to allow more than one group comment in a test or could we return early here, avoiding to read the whole file?
Quoted 2 lines
Hmm, if we defined it's as a "convention", I think we can just check only the second line of the file.
I was actually just thinking of a break after finding the "# group: " line. It would still be recognised as the third line, tenth line or anywhere else, but only one line in the file would be recognised.
But if you think only looking at the second line is even easier, we can do that. However, then I wouldn't call it "as a convention" any more in the documentation because then it wouldn't work any other way any more.
Kevin
Re: [PATCH v6 07/11] iotests: add findtests.py
In reply to Kevin WolfQuoted 6 lines · Kevin Wolf
tests/qemu-iotests/findtests.py line 127
Quoted 3 lines
tests/qemu-iotests/findtests.py new file +3
-0+ def find_tests(self, groups: Optional[List[str]] = None, + exclude_groups: Optional[List[str]] = None, + tests: Optional[List[str]] = None,group and tests seem to be read-only, so this can be simplified to 'groups: Sequence[str] = ()' etc. without the explicit handling of None below.
None comes when cmdline argument is not set, will sequence as you propose I get
Traceback (most recent call last):
File "/work/src/qemu/up-refactor-iotests/build/tests/qemu-iotests/./check", line 37, in <module>
tests, remaining_argv = find_tests(env.remaining_argv,
File "/work/src/qemu/up-refactor-iotests/tests/qemu-iotests/findtests.py", line 208, in find_tests
return tf.find_tests_argv(argv)
File "/work/src/qemu/up-refactor-iotests/tests/qemu-iotests/findtests.py", line 193, in find_tests_argv
return self.find_tests(**vars(args)), remaining
File "/work/src/qemu/up-refactor-iotests/tests/qemu-iotests/findtests.py", line 165, in find_tests
if 'disabled' not in groups and 'disabled' not in exclude_groups:
TypeError: argument of type 'NoneType' is not iterable
So, seems simpler to keep all as is than modifying find_tests_argv to not pass None arguments.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 07/11] iotests: add findtests.py
Am 14.01.2021 um 08:38 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 21 lines
Quoted 6 lines · Kevin Wolf
tests/qemu-iotests/findtests.py line 127
Quoted 3 lines
tests/qemu-iotests/findtests.py new file +3
-0+ def find_tests(self, groups: Optional[List[str]] = None, + exclude_groups: Optional[List[str]] = None, + tests: Optional[List[str]] = None,group and tests seem to be read-only, so this can be simplified to 'groups: Sequence[str] = ()' etc. without the explicit handling of None below.
None comes when cmdline argument is not set, will sequence as you propose I get
Traceback (most recent call last):
File "/work/src/qemu/up-refactor-iotests/build/tests/qemu-iotests/./check", line 37, in <module>
tests,remaining_argv= find_tests(env.remaining_argv,
File "/work/src/qemu/up-refactor-iotests/tests/qemu-iotests/findtests.py", line 208, infind_tests
returntf.find_tests_argv(argv)
File "/work/src/qemu/up-refactor-iotests/tests/qemu-iotests/findtests.py", line 193, infind_tests_argv
return self.find_tests(**vars(args)), remaining
File "/work/src/qemu/up-refactor-iotests/tests/qemu-iotests/findtests.py", line 165, infind_tests
if 'disabled' not in groups and 'disabled' not inexclude_groups:
TypeError: argument of type 'NoneType' is not iterable
Quoted 1 line
So, seems simpler to keep all as is than modifying
find_tests_argvto not pass None arguments.
Ah, I wasn't aware that you would get explicit None. Fair enough.
Kevin
Re: [PATCH v6 07/11] iotests: add findtests.py
In reply to Vladimir Sementsov-OgievskiyQuoted 10 lines · Vladimir Sementsov-Ogievskiy
Add python script with new logic of searching for tests:
Current ./check behavior:
- tests are named [0-9][0-9][0-9]
- tests must be registered in group file (even if test doesn't belong to any group, like 142)This commit don't update check behavior (which will be don in further
done
Quoted 7 lines
commit), still, the documentation changed like new behavior is already here. Let's live with this small inconsistency for the following few commits, until final change.
The file
findtests.pyis self-executable and may be used for debugging purposes.
Quoted 6 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- docs/devel/testing.rst | 50 ++++++- tests/qemu-iotests/findtests.py | 229 ++++++++++++++++++++++++++++++++ 2 files changed, 278 insertions(+), 1 deletion(-) create mode 100755 tests/qemu-iotests/findtests.py
In addition to Kevin's review,
docs/devel/testing.rst another application on the host may have locked the file, possibly leading to a · line 244
Quoted 4 lines
docs/devel/testing.rst +4
-0+Additional way of defining groups is creating tests/qemu-iotests/group.local +file. This should be used only for downstream (this file should never appear +in upstream). This file may be used for defining some downstream test groups +or for temporary disable tests, like this:
Kevin suggested s/disable/disabling/; I'd go one step further:
/temporary disable/temporarily disabling/
Quoted 2 lines
+
+- quick : Tests in this group should finish within some few seconds.
s/some/a/
Also, for each group name, the space before ':' looks odd.
tests/qemu-iotests/findtests.py line 5
Quoted 7 lines
+++
b/tests/qemu-iotests/findtests.pytests/qemu-iotests/findtests.py new file +5
-0@@ -0,0 +1,229 @@ +#!/usr/bin/env python3 +# +# Parse command line options to define set of tests to run. +# +# Copyright (c) 2020 Virtuozzo International GmbH
Worth claiming 2021 as well?
Otherwise, my python review is weak, but I didn't spot anything blatantly wrong.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v6 8/11 iotests: add testenv.py
In reply to Vladimir Sementsov-OgievskiyAdd TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused
- -xdiff option is dropped, until somebody complains that it is needed
- same for -n option
--- tests/qemu-iotests/testenv.py | 328 ++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+) create mode 100755 tests/qemu-iotests/testenv.py
tests/qemu-iotests/testenv.py new file +328 -0
@@ -0,0 +1,328 @@ +#!/usr/bin/env python3 +# +# Parse command line options to manage test environment variables. +# +# Copyright (c) 2020 Virtuozzo International GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import os +import sys +import tempfile +from pathlib import Path +import shutil +import collections +import subprocess +import argparse +from typing import List, Dict + + +def get_default_machine(qemu_prog: str) -> str: + outp = subprocess.run([qemu_prog, '-machine', 'help'], check=True, + text=True, stdout=subprocess.PIPE).stdout + + machines = outp.split('\n') + default_machine = next(m for m in machines if m.endswith(' (default)')) + default_machine = default_machine.split(' ', 1)[0] + + alias_suf = ' (alias of {})'.format(default_machine) + alias = next((m for m in machines if m.endswith(alias_suf)), None) + if alias is not None: + default_machine = alias.split(' ', 1)[0] + + return default_machine + + +class TestEnv: + """ + Manage system environment for running tests + + The following variables are supported/provided. They are represented by + lower-cased TestEnv attributes. + """ + env_variables = ['PYTHONPATH', 'TEST_DIR', 'SOCK_DIR', 'SAMPLE_IMG_DIR', + 'OUTPUT_DIR', 'PYTHON', 'QEMU_PROG', 'QEMU_IMG_PROG', + 'QEMU_IO_PROG', 'QEMU_NBD_PROG', 'QSD_PROG', + 'SOCKET_SCM_HELPER', 'QEMU_OPTIONS', 'QEMU_IMG_OPTIONS', + 'QEMU_IO_OPTIONS', 'QEMU_NBD_OPTIONS', 'IMGOPTS', + 'IMGFMT', 'IMGPROTO', 'AIOMODE', 'CACHEMODE', + 'VALGRIND_QEMU', 'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', + 'IMGOPTSSYNTAX', 'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE'] + + def get_env(self) -> Dict[str, str]: + env = {} + for v in self.env_variables: + val = getattr(self, v.lower(), None) + if val is not None: + env[v] = val + + return env + + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser + + p = argparse.ArgumentParser(description="= test environment options =", + add_help=False, usage=argparse.SUPPRESS) + + p.add_argument('-d', dest='debug', action='store_true', help='debug') + p.add_argument('-misalign', action='store_true', + help='misalign memory allocations') + + p.set_defaults(imgfmt='raw', imgproto='file') + + format_list = ['raw', 'bochs', 'cloop', 'parallels', 'qcow', 'qcow2', + 'qed', 'vdi', 'vpc', 'vhdx', 'vmdk', 'luks', 'dmg'] + g = p.add_argument_group( + 'image format options', + 'The following options sets IMGFMT environment variable. ' + 'At most one chose is allowed, default is "raw"') + g = g.add_mutually_exclusive_group() + for fmt in format_list: + g.add_argument('-' + fmt, dest='imgfmt', action='store_const', + const=fmt) + + protocol_list = ['file', 'rbd', 'sheepdoc', 'nbd', 'ssh', 'nfs', + 'fuse'] + g = p.add_argument_group( + 'image protocol options', + 'The following options sets IMGPROTO environment variably. ' + 'At most one chose is allowed, default is "file"') + g = g.add_mutually_exclusive_group() + for prt in protocol_list: + g.add_argument('-' + prt, dest='imgproto', action='store_const', + const=prt) + + g = p.add_mutually_exclusive_group() + # We don't set default for cachemode, as we need to distinguish dafult + # from user input later. + g.add_argument('-nocache', dest='cachemode', action='store_const', + const='none', help='set cache mode "none" (O_DIRECT), ' + 'sets CACHEMODE environment variable') + g.add_argument('-c', dest='cachemode', + help='sets CACHEMODE environment variable') + + p.add_argument('-i', dest='aiomode', default='threads', + help='sets AIOMODE environment variable') + + g = p.add_argument_group('bash tests options', + 'The following options are ignored by ' + 'python tests. TODO: support them in ' + 'iotests.py') + g.add_argument('-o', dest='imgopts', + help='options to pass to qemu-img create/convert, sets ' + 'IMGOPTS environment variable') + p.add_argument('-valgrind', dest='VALGRIND_QEMU', action='store_const', + const='y', help='use valgrind, sets VALGRIND_QEMU ' + 'environment variable') + + cls._argparser = p + return p + + def init_handle_argv(self, argv: List[str]) -> None: + + # Hints for mypy, about arguments which will be set by argparse + args, self.remaining_argv = self.get_argparser().parse_known_args(argv) + self.imgfmt = args.imgfmt + self.imgproto = args.imgproto + self.aiomode = args.aiomode + self.imgopts = args.imgopts + self.misalign = args.misalign + self.debug = args.debug + + if args.cachemode is None: + self.cachemode_is_default = 'true' + self.cachemode = 'writeback' + else: + self.cachemode_is_default = 'false' + self.cachemode = args.cachemode + + def init_directories(self): + """Init directory variables: + PYTHONPATH + TEST_DIR + SOCK_DIR + SAMPLE_IMG_DIR + OUTPUT_DIR + """ + self.pythonpath = os.getenv('PYTHONPATH') + if self.pythonpath: + self.pythonpath = self.source_iotests + os.pathsep + \ + self.pythonpath + else: + self.pythonpath = self.source_iotests + + self.test_dir = os.getenv('TEST_DIR', + os.path.join(os.getcwd(), 'scratch')) + Path(self.test_dir).mkdir(parents=True, exist_ok=True) + + self.sock_dir = os.getenv('SOCK_DIR') + self.tmp_sock_dir = False + if self.sock_dir: + Path(self.test_dir).mkdir(parents=True, exist_ok=True) + else: + self.sock_dir = tempfile.mkdtemp() + self.tmp_sock_dir = True + + self.sample_img_dir = os.getenv('SAMPLE_IMG_DIR', + os.path.join(self.source_iotests, + 'sample_images')) + + self.output_dir = os.getcwd() # OUTPUT_DIR + + def init_binaries(self): + """Init binary path variables: + PYTHON (for bash tests) + QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG + SOCKET_SCM_HELPER + """ + self.python = '/usr/bin/python3 -B' + + def root(*names): + return os.path.join(self.build_root, *names) + + arch = os.uname().machine + if 'ppc64' in arch: + arch = 'ppc64' + + self.qemu_prog = os.getenv('QEMU_PROG', root(f'qemu-system-{arch}')) + self.qemu_img_prog = os.getenv('QEMU_IMG_PROG', root('qemu-img')) + self.qemu_io_prog = os.getenv('QEMU_IO_PROG', root('qemu-io')) + self.qemu_nbd_prog = os.getenv('QEMU_NBD_PROG', root('qemu-nbd')) + self.qsd_prog = os.getenv('QSD_PROG', root('storage-daemon', + 'qemu-storage-daemon')) + + for b in [self.qemu_img_prog, self.qemu_io_prog, self.qemu_nbd_prog, + self.qemu_prog, self.qsd_prog]: + if not os.path.exists(b): + exit('Not such file: ' + b) + if not os.access(b, os.X_OK): + exit('Not executable: ' + b) + + helper_path = os.path.join(self.build_iotests, 'socket_scm_helper') + if os.access(helper_path, os.X_OK): + self.socket_scm_helper = helper_path # SOCKET_SCM_HELPER + + def __init__(self, argv: List[str]) -> None: + """Parse args and environment""" + + # Initialize generic paths: build_root, build_iotests, source_iotests, + # which are needed to initialize some environment variables. They are + # used by init_*() functions as well. + + + if os.path.islink(sys.argv[0]): + # called from the build tree + self.source_iotests = os.path.dirname(os.readlink(sys.argv[0])) + self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0])) + else: + # called from the source tree + self.source_iotests = os.getcwd() + self.build_iotests = self.source_iotests + + self.build_root = os.path.join(self.build_iotests, '..', '..') + + self.init_handle_argv(argv) + self.init_directories() + self.init_binaries() + + # QEMU_OPTIONS + self.qemu_options = '-nodefaults -display none -accel qtest' + machine_map = ( + (('arm', 'aarch64'), 'virt'), + ('avr', 'mega2560'), + ('rx', 'gdbsim-r5f562n8'), + ('tricore', 'tricore_testboard') + ) + for suffix, machine in machine_map: + if self.qemu_prog.endswith(f'qemu-system-{suffix}'): + self.qemu_options += f' -machine {machine}' + + # QEMU_DEFAULT_MACHINE + self.qemu_default_machine = get_default_machine(self.qemu_prog) + + self.qemu_img_options = os.getenv('QEMU_IMG_OPTIONS') + self.qemu_nbd_options = os.getenv('QEMU_NBD_OPTIONS') + + is_generic = self.imgfmt not in ['bochs', 'cloop', 'dmg'] + self.imgfmt_generic = 'true' if is_generic else 'false' + + self.qemu_io_options = f'--cache {self.cachemode} --aio {self.aiomode}' + if self.misalign: + self.qemu_io_options += ' --misalign' + + self.qemu_io_options_no_fmt = self.qemu_io_options + + if self.imgfmt == 'luks': + self.imgoptssyntax = 'true' + self.imgkeysecret = '123456' + if not self.imgopts: + self.imgopts = 'iter-time=10' + elif 'iter-time=' not in self.imgopts: + self.imgopts += ',iter-time=10' + else: + self.imgoptssyntax = 'false' + self.qemu_io_options += ' -f ' + self.imgfmt + + if self.imgfmt == 'vmkd': + if not self.imgopts: + self.imgopts = 'zeroed_grain=on' + elif 'zeroed_grain=' not in self.imgopts: + self.imgopts += ',zeroed_grain=on' + + def close(self) -> None: + if self.tmp_sock_dir: + shutil.rmtree(self.sock_dir) + + def __enter__(self) -> 'TestEnv': + return self + + def __exit__(self, *args) -> None: + self.close() + + def print_env(self) -> None: + template = """\ +QEMU -- "{QEMU_PROG}" {QEMU_OPTIONS} +QEMU_IMG -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS} +QEMU_IO -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS} +QEMU_NBD -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS} +IMGFMT -- {IMGFMT}{imgopts} +IMGPROTO -- {IMGPROTO} +PLATFORM -- {platform} +TEST_DIR -- {TEST_DIR} +SOCK_DIR -- {SOCK_DIR} +SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}""" + + args = collections.defaultdict(str, self.get_env()) + + if 'IMGOPTS' in args: + args['imgopts'] = f" ({args['IMGOPTS']})" + + u = os.uname() + args['platform'] = f'{u.sysname}/{u.machine} {u.nodename} {u.release}' + + print(template.format_map(args)) + + +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: + TestEnv.get_argparser().print_help() + exit() + + with TestEnv(sys.argv) as te: + te.print_env() + print('\nUnhandled options: ', te.remaining_argv)
Signature · 1 line
2.29.2
Re: [PATCH v6 08/11] iotests: add testenv.py
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 10 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
+************* Module testenv
+testenv.py:48:0: R0902: Too many instance attributes (34/7) (too-many-instance-attributes) +testenv.py:212:16: R1722: Consider using sys.exit() (consider-using-sys-exit) +testenv.py:214:16: R1722: Consider using sys.exit() (consider-using-sys-exit) +testenv.py:324:8: R1722: Consider using sys.exit() (consider-using-sys-exit) +testenv.py:1:0: R0801: Similar lines in 2 files
+==findtests:45 +==testenv:72 + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser
+ (duplicate-code)
+testenv.py:294: error: Function is missing a type annotation for one or more arguments
I wonder whether we should just disable the "similar lines" check? The instance attributes one looks kind of arbitrary, too. The rest looks valid enough.
Kevin
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 17 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 10 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>(quoted diff) +5
-0+************* Module testenv +testenv.py:48:0: R0902: Too many instance attributes (34/7) (too-many-instance-attributes) +testenv.py:212:16: R1722: Consider using sys.exit() (consider-using-sys-exit) +testenv.py:214:16: R1722: Consider using sys.exit() (consider-using-sys-exit) +testenv.py:324:8: R1722: Consider using sys.exit() (consider-using-sys-exit)
Review
Quoted 10 lines
(quoted diff) +10
-0+testenv.py:1:0: R0801: Similar lines in 2 files +==findtests:45 +==testenv:72 + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser + (duplicate-code) +testenv.py:294: error: Function is missing a type annotation for one or more arguments
Interesting, I don't see "similar lines" error in the output..
[root@kvm qemu-iotests]# pylint-3 --score=n findtests.py testenv.py ************* Module testenv
testenv.py:48:0: R0902: Too many instance attributes (34/7) (too-many-instance-attributes) testenv.py:212:16: R1722: Consider using sys.exit() (consider-using-sys-exit) testenv.py:214:16: R1722: Consider using sys.exit() (consider-using-sys-exit) testenv.py:324:8: R1722: Consider using sys.exit() (consider-using-sys-exit) [root@kvm qemu-iotests]# pylint --score=n findtests.py testenv.py ************* Module testenv
testenv.py:48:0: R0902: Too many instance attributes (34/7) (too-many-instance-attributes) testenv.py:212:16: R1722: Consider using sys.exit() (consider-using-sys-exit) testenv.py:214:16: R1722: Consider using sys.exit() (consider-using-sys-exit) testenv.py:324:8: R1722: Consider using sys.exit() (consider-using-sys-exit) [root@kvm qemu-iotests]# pylint-3 --version
pylint 2.6.0
astroid 2.4.2
Python 3.9.1 (default, Dec 8 2020, 00:00:00)
[GCC 10.2.1 20201125 (Red Hat 10.2.1-9)]
[root@kvm qemu-iotests]# pylint --version
pylint 2.6.0
astroid 2.4.2
Python 3.9.1 (default, Dec 8 2020, 00:00:00)
[GCC 10.2.1 20201125 (Red Hat 10.2.1-9)]
[root@kvm qemu-iotests]# which pylint-3/usr/bin/pylint-3
[root@kvm qemu-iotests]# rpm -qf /usr/bin/pylint-3 python3-pylint-2.6.0-2.fc33.noarch
Quoted 7 lines
I wonder whether we should just disable the "similar lines" check? The instance attributes one looks kind of arbitrary, too. The rest looks valid enough.
Kevin
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 22 lines · Vladimir Sementsov-Ogievskiy
Quoted 21 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 10 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>(quoted diff) +9
-0+************* Module testenv +testenv.py:48:0: R0902: Too many instance attributes (34/7) (too-many-instance-attributes) +testenv.py:212:16: R1722: Consider using sys.exit() (consider-using-sys-exit) +testenv.py:214:16: R1722: Consider using sys.exit() (consider-using-sys-exit) +testenv.py:324:8: R1722: Consider using sys.exit() (consider-using-sys-exit) +testenv.py:1:0: R0801: Similar lines in 2 files +==findtests:45 +==testenv:72 + _argparser = None
Quoted 9 lines
Quoted 6 lines
+ @classmethod
+ defget_argparser(cls)-> argparse.ArgumentParser:
+ if cls._argparser is not None:
+ return cls._argparser
+ (duplicate-code)
+testenv.py:294: error: Function is missing a type annotation for one or more argumentsInteresting, I don't see "similar lines" error in the output..
Ah, that's because I added a newline in findtests.py. Add it in testenv.py and the error comes back.
Quoted 10 lines
Quoted 8 lines
I wonder whether we should just disable the "similar lines" check? The instance attributes one looks kind of arbitrary, too. The rest looks valid enough.
Kevin
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
In reply to Vladimir Sementsov-OgievskiyQuoted 8 lines · Vladimir Sementsov-Ogievskiy
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n option
One more thing dropped is looking for binaries in $build_iotests directory.
Do someone use this feature? Or we can drop it, and reimplement when someone report the degradation?
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
Am 14.01.2021 um 05:28 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 7 lines
Quoted 6 lines · Vladimir Sementsov-Ogievskiy
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused
Quoted 6 lines
Quoted 2 lines
- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionOne more thing dropped is looking for binaries in $build_iotests directory. Do someone use this feature? Or we can drop it, and reimplement when someone report the degradation?
I seem to have socket_scm_helper only there, but you use self.build_iotests for that, so I suppose this is different from what you mean?
My tools and system emulator binaries are in the standard location in the build directory, not in the iotests build directory, so they don't need it.
Kevin
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 11 lines · Kevin Wolf
Am 14.01.2021 um 05:28 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 10 lines
Quoted 8 lines · Vladimir Sementsov-Ogievskiy
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n option
Quoted 7 lines
Quoted 3 lines
One more thing dropped is looking for binaries in $build_iotests directory. Do someone use this feature? Or we can drop it, and reimplement when someone report the degradation?
I seem to have
socket_scm_helperonly there, but you use self.build_iotests for that, so I suppose this is different from what you mean?
Yes socket_scm_helper is searched in build_iotests both pre- and after- my patches.
But for other tools (qemu-img, qemu-io, qemu-nbd, qemu, qemu-storage-daemon) old check script first search[1] in build_iotests, and then in standard location.. In this commit I don't do the step [1].
Quoted 5 lines
My tools and system emulator binaries are in the standard location in the build directory, not in the iotests build directory, so they don't need it.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
In reply to Vladimir Sementsov-OgievskiyAm 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 103 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/testenv.py | 328 ++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+) create mode 100755 tests/qemu-iotests/testenv.pytests/qemu-iotests/testenv.py new file +82
-0@@ -0,0 +1,328 @@ +#!/usr/bin/env python3 +# +# Parse command line options to manage test environment variables. +# +# Copyright (c) 2020 Virtuozzo International GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import os +import sys +import tempfile +from pathlib import Path +import shutil +import collections +import subprocess +import argparse +from typing import List, Dict + + +def get_default_machine(qemu_prog: str) -> str: + outp = subprocess.run([qemu_prog, '-machine', 'help'], check=True, + text=True, stdout=subprocess.PIPE).stdout + + machines = outp.split('\n') + default_machine = next(m for m in machines if m.endswith(' (default)')) + default_machine = default_machine.split(' ', 1)[0] + + alias_suf = ' (alias of {})'.format(default_machine) + alias = next((m for m in machines if m.endswith(alias_suf)), None) + if alias is not None: + default_machine = alias.split(' ', 1)[0] + + return default_machine + + +class TestEnv: + """ + Manage system environment for running tests + + The following variables are supported/provided. They are represented by + lower-cased TestEnv attributes. + """ + env_variables = ['PYTHONPATH', 'TEST_DIR', 'SOCK_DIR', 'SAMPLE_IMG_DIR', + 'OUTPUT_DIR', 'PYTHON', 'QEMU_PROG', 'QEMU_IMG_PROG', + 'QEMU_IO_PROG', 'QEMU_NBD_PROG', 'QSD_PROG', + 'SOCKET_SCM_HELPER', 'QEMU_OPTIONS', 'QEMU_IMG_OPTIONS', + 'QEMU_IO_OPTIONS', 'QEMU_NBD_OPTIONS', 'IMGOPTS', + 'IMGFMT', 'IMGPROTO', 'AIOMODE', 'CACHEMODE', + 'VALGRIND_QEMU', 'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', + 'IMGOPTSSYNTAX', 'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE'] + + def get_env(self) -> Dict[str, str]: + env = {} + for v in self.env_variables: + val = getattr(self, v.lower(), None) + if val is not None: + env[v] = val + + return env + + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser + + p = argparse.ArgumentParser(description="= test environment options =", + add_help=False, usage=argparse.SUPPRESS) + + p.add_argument('-d', dest='debug', action='store_true', help='debug')
tests/qemu-iotests/testenv.py line 92
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ p.add_argument('-misalign', action='store_true', + help='misalign memory allocations') + + p.set_defaults(imgfmt='raw', imgproto='file') + + format_list = ['raw', 'bochs', 'cloop', 'parallels', 'qcow', 'qcow2', + 'qed', 'vdi', 'vpc', 'vhdx', 'vmdk', 'luks', 'dmg'] + g = p.add_argument_group( + 'image format options', + 'The following options sets IMGFMT environment variable. '
s/sets/set the/
tests/qemu-iotests/testenv.py line 93
Quoted 1 line
tests/qemu-iotests/testenv.py new file +1
-0+ 'At most one chose is allowed, default is "raw"')
s/chose/choice/
tests/qemu-iotests/testenv.py line 104
Quoted 11 lines
tests/qemu-iotests/testenv.py new file +11
-0+ g = g.add_mutually_exclusive_group() + for fmt in format_list: + g.add_argument('-' + fmt, dest='imgfmt', action='store_const', + const=fmt) + + protocol_list = ['file', 'rbd', 'sheepdoc', 'nbd', 'ssh', 'nfs', + 'fuse'] + g = p.add_argument_group( + 'image protocol options', + 'The following options sets IMGPROTO environment variably. ' + 'At most one chose is allowed, default is "file"')
Same as above, but also s/variably/variable/.
Do we consider these environment variables user interfaces? So far I thought of them as implementation details, but I guess if we want to allow users to execute test scripts manually, they are some kind of user interface.
However, shouldn't the variables themselves then be documented somewhere? As it is, this feels like documenting thing X to be the same as thing Y, without ever saying what Y is.
That said...
tests/qemu-iotests/testenv.py line 108
Quoted 4 lines
tests/qemu-iotests/testenv.py new file +4
-0+ g = g.add_mutually_exclusive_group() + for prt in protocol_list: + g.add_argument('-' + prt, dest='imgproto', action='store_const', + const=prt)
...maybe we should just have help=f"test {fmt/prt}" here to match the old help text. Then this documents the option and the help above actually documents the environment variable.
Quoted 7 lines
tests/qemu-iotests/testenv.py new file +7
-0+ + g = p.add_mutually_exclusive_group() + # We don't set default for cachemode, as we need to distinguish dafult + # from user input later. + g.add_argument('-nocache', dest='cachemode', action='store_const', + const='none', help='set cache mode "none" (O_DIRECT), ' + 'sets CACHEMODE environment variable')
tests/qemu-iotests/testenv.py line 125
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ g.add_argument('-c', dest='cachemode', + help='sets CACHEMODE environment variable') + + p.add_argument('-i', dest='aiomode', default='threads', + help='sets AIOMODE environment variable') + + g = p.add_argument_group('bash tests options', + 'The following options are ignored by ' + 'python tests. TODO: support them in ' + 'iotests.py')
Let's not print TODO comments to the user, but just make it a comment in the code. That makes it stand out better with syntax highlighting anyway.
tests/qemu-iotests/testenv.py line 138
Quoted 13 lines
tests/qemu-iotests/testenv.py new file +13
-0+ g.add_argument('-o', dest='imgopts', + help='options to pass to qemu-img create/convert, sets ' + 'IMGOPTS environment variable') + p.add_argument('-valgrind', dest='VALGRIND_QEMU', action='store_const', + const='y', help='use valgrind, sets VALGRIND_QEMU ' + 'environment variable') + + cls._argparser = p + return p + + def init_handle_argv(self, argv: List[str]) -> None: + + # Hints for mypy, about arguments which will be set by argparse
I don't understand what this comment wants to tell me.
Quoted 45 lines
tests/qemu-iotests/testenv.py new file +45
-0+ args, self.remaining_argv = self.get_argparser().parse_known_args(argv) + self.imgfmt = args.imgfmt + self.imgproto = args.imgproto + self.aiomode = args.aiomode + self.imgopts = args.imgopts + self.misalign = args.misalign + self.debug = args.debug + + if args.cachemode is None: + self.cachemode_is_default = 'true' + self.cachemode = 'writeback' + else: + self.cachemode_is_default = 'false' + self.cachemode = args.cachemode + + def init_directories(self): + """Init directory variables: + PYTHONPATH + TEST_DIR + SOCK_DIR + SAMPLE_IMG_DIR + OUTPUT_DIR + """ + self.pythonpath = os.getenv('PYTHONPATH') + if self.pythonpath: + self.pythonpath = self.source_iotests + os.pathsep + \ + self.pythonpath + else: + self.pythonpath = self.source_iotests + + self.test_dir = os.getenv('TEST_DIR', + os.path.join(os.getcwd(), 'scratch')) + Path(self.test_dir).mkdir(parents=True, exist_ok=True) + + self.sock_dir = os.getenv('SOCK_DIR') + self.tmp_sock_dir = False + if self.sock_dir: + Path(self.test_dir).mkdir(parents=True, exist_ok=True) + else: + self.sock_dir = tempfile.mkdtemp() + self.tmp_sock_dir = True + + self.sample_img_dir = os.getenv('SAMPLE_IMG_DIR', + os.path.join(self.source_iotests, + 'sample_images'))
tests/qemu-iotests/testenv.py line 193
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ + self.output_dir = os.getcwd() # OUTPUT_DIR + + def init_binaries(self): + """Init binary path variables: + PYTHON (for bash tests) + QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG + SOCKET_SCM_HELPER + """ + self.python = '/usr/bin/python3 -B'
This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Quoted 42 lines
tests/qemu-iotests/testenv.py new file +42
-0+ def root(*names): + return os.path.join(self.build_root, *names) + + arch = os.uname().machine + if 'ppc64' in arch: + arch = 'ppc64' + + self.qemu_prog = os.getenv('QEMU_PROG', root(f'qemu-system-{arch}')) + self.qemu_img_prog = os.getenv('QEMU_IMG_PROG', root('qemu-img')) + self.qemu_io_prog = os.getenv('QEMU_IO_PROG', root('qemu-io')) + self.qemu_nbd_prog = os.getenv('QEMU_NBD_PROG', root('qemu-nbd')) + self.qsd_prog = os.getenv('QSD_PROG', root('storage-daemon', + 'qemu-storage-daemon')) + + for b in [self.qemu_img_prog, self.qemu_io_prog, self.qemu_nbd_prog, + self.qemu_prog, self.qsd_prog]: + if not os.path.exists(b): + exit('Not such file: ' + b) + if not os.access(b, os.X_OK): + exit('Not executable: ' + b) + + helper_path = os.path.join(self.build_iotests, 'socket_scm_helper') + if os.access(helper_path, os.X_OK): + self.socket_scm_helper = helper_path # SOCKET_SCM_HELPER + + def __init__(self, argv: List[str]) -> None: + """Parse args and environment""" + + # Initialize generic paths: build_root, build_iotests, source_iotests, + # which are needed to initialize some environment variables. They are + # used by init_*() functions as well. + + + if os.path.islink(sys.argv[0]): + # called from the build tree + self.source_iotests = os.path.dirname(os.readlink(sys.argv[0])) + self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0])) + else: + # called from the source tree + self.source_iotests = os.getcwd() + self.build_iotests = self.source_iotests +
tests/qemu-iotests/testenv.py line 246
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ self.build_root = os.path.join(self.build_iotests, '..', '..') + + self.init_handle_argv(argv) + self.init_directories() + self.init_binaries() + + # QEMU_OPTIONS + self.qemu_options = '-nodefaults -display none -accel qtest' + machine_map = ( + (('arm', 'aarch64'), 'virt'),
How does this work? Won't we check for "qemu-system-('arm', 'aarch64')" below, which we'll never find?
Quoted 72 lines
tests/qemu-iotests/testenv.py new file +72
-0+ ('avr', 'mega2560'), + ('rx', 'gdbsim-r5f562n8'), + ('tricore', 'tricore_testboard') + ) + for suffix, machine in machine_map: + if self.qemu_prog.endswith(f'qemu-system-{suffix}'): + self.qemu_options += f' -machine {machine}' + + # QEMU_DEFAULT_MACHINE + self.qemu_default_machine = get_default_machine(self.qemu_prog) + + self.qemu_img_options = os.getenv('QEMU_IMG_OPTIONS') + self.qemu_nbd_options = os.getenv('QEMU_NBD_OPTIONS') + + is_generic = self.imgfmt not in ['bochs', 'cloop', 'dmg'] + self.imgfmt_generic = 'true' if is_generic else 'false' + + self.qemu_io_options = f'--cache {self.cachemode} --aio {self.aiomode}' + if self.misalign: + self.qemu_io_options += ' --misalign' + + self.qemu_io_options_no_fmt = self.qemu_io_options + + if self.imgfmt == 'luks': + self.imgoptssyntax = 'true' + self.imgkeysecret = '123456' + if not self.imgopts: + self.imgopts = 'iter-time=10' + elif 'iter-time=' not in self.imgopts: + self.imgopts += ',iter-time=10' + else: + self.imgoptssyntax = 'false' + self.qemu_io_options += ' -f ' + self.imgfmt + + if self.imgfmt == 'vmkd': + if not self.imgopts: + self.imgopts = 'zeroed_grain=on' + elif 'zeroed_grain=' not in self.imgopts: + self.imgopts += ',zeroed_grain=on' + + def close(self) -> None: + if self.tmp_sock_dir: + shutil.rmtree(self.sock_dir) + + def __enter__(self) -> 'TestEnv': + return self + + def __exit__(self, *args) -> None: + self.close() + + def print_env(self) -> None: + template = """\ +QEMU -- "{QEMU_PROG}" {QEMU_OPTIONS} +QEMU_IMG -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS} +QEMU_IO -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS} +QEMU_NBD -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS} +IMGFMT -- {IMGFMT}{imgopts} +IMGPROTO -- {IMGPROTO} +PLATFORM -- {platform} +TEST_DIR -- {TEST_DIR} +SOCK_DIR -- {SOCK_DIR} +SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}""" + + args = collections.defaultdict(str, self.get_env()) + + if 'IMGOPTS' in args: + args['imgopts'] = f" ({args['IMGOPTS']})" + + u = os.uname() + args['platform'] = f'{u.sysname}/{u.machine} {u.nodename} {u.release}' + + print(template.format_map(args))
tests/qemu-iotests/testenv.py line 328
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ + +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: + TestEnv.get_argparser().print_help() + exit() + + with TestEnv(sys.argv) as te: + te.print_env() + print('\nUnhandled options: ', te.remaining_argv)
Kevin
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 135 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 103 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/testenv.py | 328 ++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+)create mode 100755
tests/qemu-iotests/testenv.pytests/qemu-iotests/testenv.py new file +82
-0@@ -0,0 +1,328 @@ +#!/usr/bin/env python3 +# +# Parse command line options to manage test environment variables. +# +# Copyright (c) 2020 Virtuozzo International GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import os +import sys +import tempfile +from pathlib import Path +import shutil +import collections +import subprocess +import argparse +from typing import List, Dict + + +def get_default_machine(qemu_prog: str) -> str: + outp = subprocess.run([qemu_prog, '-machine', 'help'], check=True, + text=True, stdout=subprocess.PIPE).stdout + + machines = outp.split('\n') + default_machine = next(m for m in machines if m.endswith(' (default)')) + default_machine = default_machine.split(' ', 1)[0] + + alias_suf = ' (alias of {})'.format(default_machine) + alias = next((m for m in machines if m.endswith(alias_suf)), None) + if alias is not None: + default_machine = alias.split(' ', 1)[0] + + return default_machine + + +class TestEnv: + """ + Manage system environment for running tests + + The following variables are supported/provided. They are represented by + lower-cased TestEnv attributes. + """ + env_variables = ['PYTHONPATH', 'TEST_DIR', 'SOCK_DIR', 'SAMPLE_IMG_DIR', + 'OUTPUT_DIR', 'PYTHON', 'QEMU_PROG', 'QEMU_IMG_PROG', + 'QEMU_IO_PROG', 'QEMU_NBD_PROG', 'QSD_PROG', + 'SOCKET_SCM_HELPER', 'QEMU_OPTIONS', 'QEMU_IMG_OPTIONS', + 'QEMU_IO_OPTIONS', 'QEMU_NBD_OPTIONS', 'IMGOPTS', + 'IMGFMT', 'IMGPROTO', 'AIOMODE', 'CACHEMODE', + 'VALGRIND_QEMU', 'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', + 'IMGOPTSSYNTAX', 'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE'] + + def get_env(self) -> Dict[str, str]: + env = {} + for v in self.env_variables: + val = getattr(self, v.lower(), None) + if val is not None: + env[v] = val + + return env + + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser + + p = argparse.ArgumentParser(description="= test environment options =", + add_help=False, usage=argparse.SUPPRESS) + + p.add_argument('-d', dest='debug', action='store_true', help='debug')tests/qemu-iotests/testenv.py line 92
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ p.add_argument('-misalign', action='store_true', + help='misalign memory allocations') + + p.set_defaults(imgfmt='raw', imgproto='file') + + format_list = ['raw', 'bochs', 'cloop', 'parallels', 'qcow', 'qcow2', + 'qed', 'vdi', 'vpc', 'vhdx', 'vmdk', 'luks', 'dmg'] + g = p.add_argument_group( + 'image format options', + 'The following options sets IMGFMT environment variable. 's/sets/set the/
tests/qemu-iotests/testenv.py line 93
Quoted 1 line
tests/qemu-iotests/testenv.py new file +1
-0+ 'At most one chose is allowed, default is "raw"')s/chose/choice/
tests/qemu-iotests/testenv.py line 104
Quoted 11 lines
tests/qemu-iotests/testenv.py new file +11
-0+ g = g.add_mutually_exclusive_group() + for fmt in format_list: + g.add_argument('-' + fmt, dest='imgfmt', action='store_const', + const=fmt) + + protocol_list = ['file', 'rbd', 'sheepdoc', 'nbd', 'ssh', 'nfs', + 'fuse'] + g = p.add_argument_group( + 'image protocol options', + 'The following options sets IMGPROTO environment variably. ' + 'At most one chose is allowed, default is "file"')Same as above, but also s/variably/variable/.
Quoted 8 lines
Do we consider these environment variables user interfaces? So far I thought of them as implementation details, but I guess if we want to allow users to execute test scripts manually, they are some kind of user interface.
However, shouldn't the variables themselves then be documented somewhere? As it is, this feels like documenting thing X to be the same as thing Y, without ever saying what Y is.
Yes, I do think that we lack some specification on the test interface, including environment variables.. And then, probably some unification of the interface, to be more clear and straightforward. But don't want to improve/refactor these things in these series.
Quoted 11 lines
That said...
tests/qemu-iotests/testenv.py line 108
Quoted 4 lines
tests/qemu-iotests/testenv.py new file +4
-0+ g = g.add_mutually_exclusive_group() + for prt in protocol_list: + g.add_argument('-' + prt, dest='imgproto', action='store_const', + const=prt)...maybe we should just have help=f"test {fmt/prt}" here to match the old help text. Then this documents the option and the help above actually documents the environment variable.
OK
Quoted 23 lines
Quoted 8 lines
tests/qemu-iotests/testenv.py new file +7
-0+ + g = p.add_mutually_exclusive_group() + # We don't set default for cachemode, as we need to distinguish dafult + # from user input later. + g.add_argument('-nocache', dest='cachemode', action='store_const', + const='none', help='set cache mode "none" (O_DIRECT), ' + 'sets CACHEMODE environment variable')tests/qemu-iotests/testenv.py line 125
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ g.add_argument('-c', dest='cachemode', + help='sets CACHEMODE environment variable') + + p.add_argument('-i', dest='aiomode', default='threads', + help='sets AIOMODE environment variable') + + g = p.add_argument_group('bash tests options', + 'The following options are ignored by ' + 'python tests. TODO: support them in ' + 'iotests.py')Let's not print TODO comments to the user, but just make it a comment in the code. That makes it stand out better with syntax highlighting anyway.
Quoted 15 lines
tests/qemu-iotests/testenv.py line 138
Quoted 13 lines
tests/qemu-iotests/testenv.py new file +13
-0+ g.add_argument('-o', dest='imgopts', + help='options to pass to qemu-img create/convert, sets ' + 'IMGOPTS environment variable') + p.add_argument('-valgrind', dest='VALGRIND_QEMU', action='store_const', + const='y', help='use valgrind, sets VALGRIND_QEMU ' + 'environment variable') + + cls._argparser = p + return p + + def init_handle_argv(self, argv: List[str]) -> None: + + # Hints for mypy, about arguments which will be set by argparseI don't understand what this comment wants to tell me.
I mean, I could automatically set self. attributes from args, but do it explictly to sutisfy mypy. But..
Actually, I'll move argv interface out of the file for v7.
I recently learned from another project, that merging cmdline interface (like it done her) into logic(model) class is a bad idea. (I just had to refactor it and split ligic from the interface, to reuse logic classes with another interface) [1]
Also, trying to fix pylint and mypy complains, I had to inherit classes from AbstractContextManager (for mypy).. And then, how to fix "testenv.py:1:0: R0801: Similar lines in 2 files" ? You wandered, should we disable it.. I think not. It's a good warning, showing bad design. True way of fixing is creating a base class with common functionality.. But than.. Multiple inheritance to sutisfy linters? Haha. This brings us to [1] again.
So, I decided to keep the classes with normal python interface (__init__ with normal arguments), and move the whole cmdline interface into check script itself. It looks a lot better.. Also, TestEnv is complicated enough even without argument parsing.
Quoted 51 lines
Quoted 51 lines
tests/qemu-iotests/testenv.py new file +50
-0+ args, self.remaining_argv = self.get_argparser().parse_known_args(argv) + self.imgfmt = args.imgfmt + self.imgproto = args.imgproto + self.aiomode = args.aiomode + self.imgopts = args.imgopts + self.misalign = args.misalign + self.debug = args.debug + + if args.cachemode is None: + self.cachemode_is_default = 'true' + self.cachemode = 'writeback' + else: + self.cachemode_is_default = 'false' + self.cachemode = args.cachemode + + def init_directories(self): + """Init directory variables: + PYTHONPATH + TEST_DIR + SOCK_DIR + SAMPLE_IMG_DIR + OUTPUT_DIR + """ + self.pythonpath = os.getenv('PYTHONPATH') + if self.pythonpath: + self.pythonpath = self.source_iotests + os.pathsep + \ + self.pythonpath + else: + self.pythonpath = self.source_iotests + + self.test_dir = os.getenv('TEST_DIR', + os.path.join(os.getcwd(), 'scratch')) + Path(self.test_dir).mkdir(parents=True, exist_ok=True) + + self.sock_dir = os.getenv('SOCK_DIR') + self.tmp_sock_dir = False + if self.sock_dir: + Path(self.test_dir).mkdir(parents=True, exist_ok=True) + else: + self.sock_dir = tempfile.mkdtemp() + self.tmp_sock_dir = True + + self.sample_img_dir = os.getenv('SAMPLE_IMG_DIR', + os.path.join(self.source_iotests, + 'sample_images')) + + self.output_dir = os.getcwd() # OUTPUT_DIR + + def init_binaries(self): + """Init binary path variables:
Quoted 8 lines
tests/qemu-iotests/testenv.py line 193
Quoted 5 lines
tests/qemu-iotests/testenv.py new file +5
-0+ PYTHON (for bash tests) + QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG + SOCKET_SCM_HELPER + """ + self.python = '/usr/bin/python3 -B'This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Oh, I missed the change. Then I should just drop this self.python.
Quoted 48 lines
Quoted 48 lines
tests/qemu-iotests/testenv.py new file +47
-0+ def root(*names): + return os.path.join(self.build_root, *names) + + arch = os.uname().machine + if 'ppc64' in arch: + arch = 'ppc64' + + self.qemu_prog = os.getenv('QEMU_PROG', root(f'qemu-system-{arch}')) + self.qemu_img_prog = os.getenv('QEMU_IMG_PROG', root('qemu-img')) + self.qemu_io_prog = os.getenv('QEMU_IO_PROG', root('qemu-io')) + self.qemu_nbd_prog = os.getenv('QEMU_NBD_PROG', root('qemu-nbd')) + self.qsd_prog = os.getenv('QSD_PROG', root('storage-daemon', + 'qemu-storage-daemon')) + + for b in [self.qemu_img_prog, self.qemu_io_prog, self.qemu_nbd_prog, + self.qemu_prog, self.qsd_prog]: + if not os.path.exists(b): + exit('Not such file: ' + b) + if not os.access(b, os.X_OK): + exit('Not executable: ' + b) + + helper_path = os.path.join(self.build_iotests, 'socket_scm_helper') + if os.access(helper_path, os.X_OK): + self.socket_scm_helper = helper_path # SOCKET_SCM_HELPER + + def __init__(self, argv: List[str]) -> None: + """Parse args and environment""" + + # Initialize generic paths: build_root, build_iotests, source_iotests, + # which are needed to initialize some environment variables. They are + # used by init_*() functions as well. + + + if os.path.islink(sys.argv[0]): + # called from the build tree + self.source_iotests = os.path.dirname(os.readlink(sys.argv[0])) + self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0])) + else: + # called from the source tree + self.source_iotests = os.getcwd() + self.build_iotests = self.source_iotests + + self.build_root = os.path.join(self.build_iotests, '..', '..') + + self.init_handle_argv(argv) + self.init_directories() + self.init_binaries()
Quoted 8 lines
tests/qemu-iotests/testenv.py line 246
Quoted 5 lines
tests/qemu-iotests/testenv.py new file +5
-0+ + # QEMU_OPTIONS + self.qemu_options = '-nodefaults -display none -accel qtest' + machine_map = ( + (('arm', 'aarch64'), 'virt'),How does this work? Won't we check for "qemu-system-('arm', 'aarch64')" below, which we'll never find?
Hmm. I just took existing logic from check:
[..]
case "$QEMU_PROG" in
*qemu-system-arm|*qemu-system-aarch64)
export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt"
;;[..]
Quoted 77 lines
Quoted 77 lines
tests/qemu-iotests/testenv.py new file +76
-0+ ('avr', 'mega2560'), + ('rx', 'gdbsim-r5f562n8'), + ('tricore', 'tricore_testboard') + ) + for suffix, machine in machine_map: + if self.qemu_prog.endswith(f'qemu-system-{suffix}'): + self.qemu_options += f' -machine {machine}' + + # QEMU_DEFAULT_MACHINE + self.qemu_default_machine = get_default_machine(self.qemu_prog) + + self.qemu_img_options = os.getenv('QEMU_IMG_OPTIONS') + self.qemu_nbd_options = os.getenv('QEMU_NBD_OPTIONS') + + is_generic = self.imgfmt not in ['bochs', 'cloop', 'dmg'] + self.imgfmt_generic = 'true' if is_generic else 'false' + + self.qemu_io_options = f'--cache {self.cachemode} --aio {self.aiomode}' + if self.misalign: + self.qemu_io_options += ' --misalign' + + self.qemu_io_options_no_fmt = self.qemu_io_options + + if self.imgfmt == 'luks': + self.imgoptssyntax = 'true' + self.imgkeysecret = '123456' + if not self.imgopts: + self.imgopts = 'iter-time=10' + elif 'iter-time=' not in self.imgopts: + self.imgopts += ',iter-time=10' + else: + self.imgoptssyntax = 'false' + self.qemu_io_options += ' -f ' + self.imgfmt + + if self.imgfmt == 'vmkd': + if not self.imgopts: + self.imgopts = 'zeroed_grain=on' + elif 'zeroed_grain=' not in self.imgopts: + self.imgopts += ',zeroed_grain=on' + + def close(self) -> None: + if self.tmp_sock_dir: + shutil.rmtree(self.sock_dir) + + def __enter__(self) -> 'TestEnv': + return self + + def __exit__(self, *args) -> None: + self.close() + + def print_env(self) -> None: + template = """\ +QEMU -- "{QEMU_PROG}" {QEMU_OPTIONS} +QEMU_IMG -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS} +QEMU_IO -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS} +QEMU_NBD -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS} +IMGFMT -- {IMGFMT}{imgopts} +IMGPROTO -- {IMGPROTO} +PLATFORM -- {platform} +TEST_DIR -- {TEST_DIR} +SOCK_DIR -- {SOCK_DIR} +SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}""" + + args = collections.defaultdict(str, self.get_env()) + + if 'IMGOPTS' in args: + args['imgopts'] = f" ({args['IMGOPTS']})" + + u = os.uname() + args['platform'] = f'{u.sysname}/{u.machine} {u.nodename} {u.release}' + + print(template.format_map(args)) + + +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']:
Quoted 9 lines
tests/qemu-iotests/testenv.py line 328
Quoted 6 lines
tests/qemu-iotests/testenv.py new file +6
-0+ TestEnv.get_argparser().print_help() + exit() + + with TestEnv(sys.argv) as te: + te.print_env() + print('\nUnhandled options: ', te.remaining_argv)Kevin
Thanks for reviewing! I hope to post v7 today, with cmdline interface in 'check' script.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
Am 15.01.2021 um 13:19 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 141 lines
Quoted 140 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 103 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/testenv.py | 328 ++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+)create mode 100755
tests/qemu-iotests/testenv.pytests/qemu-iotests/testenv.py new file +82
-0@@ -0,0 +1,328 @@ +#!/usr/bin/env python3 +# +# Parse command line options to manage test environment variables. +# +# Copyright (c) 2020 Virtuozzo International GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import os +import sys +import tempfile +from pathlib import Path +import shutil +import collections +import subprocess +import argparse +from typing import List, Dict + + +def get_default_machine(qemu_prog: str) -> str: + outp = subprocess.run([qemu_prog, '-machine', 'help'], check=True, + text=True, stdout=subprocess.PIPE).stdout + + machines = outp.split('\n') + default_machine = next(m for m in machines if m.endswith(' (default)')) + default_machine = default_machine.split(' ', 1)[0] + + alias_suf = ' (alias of {})'.format(default_machine) + alias = next((m for m in machines if m.endswith(alias_suf)), None) + if alias is not None: + default_machine = alias.split(' ', 1)[0] + + return default_machine + + +class TestEnv: + """ + Manage system environment for running tests + + The following variables are supported/provided. They are represented by + lower-cased TestEnv attributes. + """ + env_variables = ['PYTHONPATH', 'TEST_DIR', 'SOCK_DIR', 'SAMPLE_IMG_DIR', + 'OUTPUT_DIR', 'PYTHON', 'QEMU_PROG', 'QEMU_IMG_PROG', + 'QEMU_IO_PROG', 'QEMU_NBD_PROG', 'QSD_PROG', + 'SOCKET_SCM_HELPER', 'QEMU_OPTIONS', 'QEMU_IMG_OPTIONS', + 'QEMU_IO_OPTIONS', 'QEMU_NBD_OPTIONS', 'IMGOPTS', + 'IMGFMT', 'IMGPROTO', 'AIOMODE', 'CACHEMODE', + 'VALGRIND_QEMU', 'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', + 'IMGOPTSSYNTAX', 'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE'] + + def get_env(self) -> Dict[str, str]: + env = {} + for v in self.env_variables: + val = getattr(self, v.lower(), None) + if val is not None: + env[v] = val + + return env + + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser + + p = argparse.ArgumentParser(description="= test environment options =", + add_help=False, usage=argparse.SUPPRESS) + + p.add_argument('-d', dest='debug', action='store_true', help='debug')tests/qemu-iotests/testenv.py line 92
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ p.add_argument('-misalign', action='store_true', + help='misalign memory allocations') + + p.set_defaults(imgfmt='raw', imgproto='file') + + format_list = ['raw', 'bochs', 'cloop', 'parallels', 'qcow', 'qcow2', + 'qed', 'vdi', 'vpc', 'vhdx', 'vmdk', 'luks', 'dmg'] + g = p.add_argument_group( + 'image format options', + 'The following options sets IMGFMT environment variable. 's/sets/set the/
tests/qemu-iotests/testenv.py line 93
Quoted 1 line
tests/qemu-iotests/testenv.py new file +1
-0+ 'At most one chose is allowed, default is "raw"')s/chose/choice/
tests/qemu-iotests/testenv.py line 104
Quoted 11 lines
tests/qemu-iotests/testenv.py new file +11
-0+ g = g.add_mutually_exclusive_group() + for fmt in format_list: + g.add_argument('-' + fmt, dest='imgfmt', action='store_const', + const=fmt) + + protocol_list = ['file', 'rbd', 'sheepdoc', 'nbd', 'ssh', 'nfs', + 'fuse'] + g = p.add_argument_group( + 'image protocol options', + 'The following options sets IMGPROTO environment variably. ' + 'At most one chose is allowed, default is "file"')Same as above, but also s/variably/variable/.
Do we consider these environment variables user interfaces? So far I thought of them as implementation details, but I guess if we want to allow users to execute test scripts manually, they are some kind of user interface.
Quoted 8 lines
Quoted 3 lines
However, shouldn't the variables themselves then be documented somewhere? As it is, this feels like documenting thing X to be the same as thing Y, without ever saying what Y is.
Yes, I do think that we lack some specification on the test interface, including environment variables.. And then, probably some unification of the interface, to be more clear and straightforward. But don't want to improve/refactor these things in these series.
Yeah, that's fair. If the new help provides at least the same information as the old one, that is good enough for me.
Quoted 71 lines
Quoted 11 lines
That said...
tests/qemu-iotests/testenv.py line 108
Quoted 4 lines
tests/qemu-iotests/testenv.py new file +4
-0+ g = g.add_mutually_exclusive_group() + for prt in protocol_list: + g.add_argument('-' + prt, dest='imgproto', action='store_const', + const=prt)...maybe we should just have help=f"test {fmt/prt}" here to match the old help text. Then this documents the option and the help above actually documents the environment variable.
OK
Quoted 23 lines
Quoted 8 lines
tests/qemu-iotests/testenv.py new file +7
-0+ + g = p.add_mutually_exclusive_group() + # We don't set default for cachemode, as we need to distinguish dafult + # from user input later. + g.add_argument('-nocache', dest='cachemode', action='store_const', + const='none', help='set cache mode "none" (O_DIRECT), ' + 'sets CACHEMODE environment variable')tests/qemu-iotests/testenv.py line 125
Quoted 10 lines
tests/qemu-iotests/testenv.py new file +10
-0+ g.add_argument('-c', dest='cachemode', + help='sets CACHEMODE environment variable') + + p.add_argument('-i', dest='aiomode', default='threads', + help='sets AIOMODE environment variable') + + g = p.add_argument_group('bash tests options', + 'The following options are ignored by ' + 'python tests. TODO: support them in ' + 'iotests.py')Let's not print TODO comments to the user, but just make it a comment in the code. That makes it stand out better with syntax highlighting anyway.
Quoted 15 lines
tests/qemu-iotests/testenv.py line 138
Quoted 13 lines
tests/qemu-iotests/testenv.py new file +13
-0+ g.add_argument('-o', dest='imgopts', + help='options to pass to qemu-img create/convert, sets ' + 'IMGOPTS environment variable') + p.add_argument('-valgrind', dest='VALGRIND_QEMU', action='store_const', + const='y', help='use valgrind, sets VALGRIND_QEMU ' + 'environment variable') + + cls._argparser = p + return p + + def init_handle_argv(self, argv: List[str]) -> None: + + # Hints for mypy, about arguments which will be set by argparseI don't understand what this comment wants to tell me.
I mean, I could automatically set self. attributes from args, but do it explictly to sutisfy mypy. But..
Actually, I'll move argv interface out of the file for v7.
I recently learned from another project, that merging cmdline interface (like it done her) into logic(model) class is a bad idea. (I just had to refactor it and split ligic from the interface, to reuse logic classes with another interface) [1]
Also, trying to fix pylint and mypy complains, I had to inherit classes from AbstractContextManager (for mypy).. And then, how to fix "testenv.py:1:0: R0801: Similar lines in 2 files" ? You wandered, should we disable it.. I think not. It's a good warning, showing bad design. True way of fixing is creating a base class with common functionality.. But than.. Multiple inheritance to sutisfy linters? Haha. This brings us to [1] again.
Quoted 4 lines
So, I decided to keep the classes with normal python interface (
__init__with normal arguments), and move the whole cmdline interface into check script itself. It looks a lot better.. Also, TestEnv is complicated enough even without argument parsing.
Ok, then I'll wait for your new version to see what it looks like.
Quoted 60 lines
Quoted 51 lines
Quoted 51 lines
tests/qemu-iotests/testenv.py new file +50
-0+ args, self.remaining_argv = self.get_argparser().parse_known_args(argv) + self.imgfmt = args.imgfmt + self.imgproto = args.imgproto + self.aiomode = args.aiomode + self.imgopts = args.imgopts + self.misalign = args.misalign + self.debug = args.debug + + if args.cachemode is None: + self.cachemode_is_default = 'true' + self.cachemode = 'writeback' + else: + self.cachemode_is_default = 'false' + self.cachemode = args.cachemode + + def init_directories(self): + """Init directory variables: + PYTHONPATH + TEST_DIR + SOCK_DIR + SAMPLE_IMG_DIR + OUTPUT_DIR + """ + self.pythonpath = os.getenv('PYTHONPATH') + if self.pythonpath: + self.pythonpath = self.source_iotests + os.pathsep + \ + self.pythonpath + else: + self.pythonpath = self.source_iotests + + self.test_dir = os.getenv('TEST_DIR', + os.path.join(os.getcwd(), 'scratch')) + Path(self.test_dir).mkdir(parents=True, exist_ok=True) + + self.sock_dir = os.getenv('SOCK_DIR') + self.tmp_sock_dir = False + if self.sock_dir: + Path(self.test_dir).mkdir(parents=True, exist_ok=True) + else: + self.sock_dir = tempfile.mkdtemp() + self.tmp_sock_dir = True + + self.sample_img_dir = os.getenv('SAMPLE_IMG_DIR', + os.path.join(self.source_iotests, + 'sample_images')) + + self.output_dir = os.getcwd() # OUTPUT_DIR + + def init_binaries(self): + """Init binary path variables:Quoted 8 lines
tests/qemu-iotests/testenv.py line 193
Quoted 5 lines
tests/qemu-iotests/testenv.py new file +5
-0+ PYTHON (for bash tests) + QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG + SOCKET_SCM_HELPER + """ + self.python = '/usr/bin/python3 -B'This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Quoted 1 line
Oh, I missed the change. Then I should just drop this self.python.
Do we still get the value from elsewhere or do we need to manually parse common.env?
Quoted 57 lines
Quoted 48 lines
Quoted 48 lines
tests/qemu-iotests/testenv.py new file +47
-0+ def root(*names): + return os.path.join(self.build_root, *names) + + arch = os.uname().machine + if 'ppc64' in arch: + arch = 'ppc64' + + self.qemu_prog = os.getenv('QEMU_PROG', root(f'qemu-system-{arch}')) + self.qemu_img_prog = os.getenv('QEMU_IMG_PROG', root('qemu-img')) + self.qemu_io_prog = os.getenv('QEMU_IO_PROG', root('qemu-io')) + self.qemu_nbd_prog = os.getenv('QEMU_NBD_PROG', root('qemu-nbd')) + self.qsd_prog = os.getenv('QSD_PROG', root('storage-daemon', + 'qemu-storage-daemon')) + + for b in [self.qemu_img_prog, self.qemu_io_prog, self.qemu_nbd_prog, + self.qemu_prog, self.qsd_prog]: + if not os.path.exists(b): + exit('Not such file: ' + b) + if not os.access(b, os.X_OK): + exit('Not executable: ' + b) + + helper_path = os.path.join(self.build_iotests, 'socket_scm_helper') + if os.access(helper_path, os.X_OK): + self.socket_scm_helper = helper_path # SOCKET_SCM_HELPER + + def __init__(self, argv: List[str]) -> None: + """Parse args and environment""" + + # Initialize generic paths: build_root, build_iotests, source_iotests, + # which are needed to initialize some environment variables. They are + # used by init_*() functions as well. + + + if os.path.islink(sys.argv[0]): + # called from the build tree + self.source_iotests = os.path.dirname(os.readlink(sys.argv[0])) + self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0])) + else: + # called from the source tree + self.source_iotests = os.getcwd() + self.build_iotests = self.source_iotests + + self.build_root = os.path.join(self.build_iotests, '..', '..') + + self.init_handle_argv(argv) + self.init_directories() + self.init_binaries()Quoted 8 lines
tests/qemu-iotests/testenv.py line 246
Quoted 5 lines
tests/qemu-iotests/testenv.py new file +5
-0+ + # QEMU_OPTIONS + self.qemu_options = '-nodefaults -display none -accel qtest' + machine_map = ( + (('arm', 'aarch64'), 'virt'),How does this work? Won't we check for "qemu-system-('arm', 'aarch64')" below, which we'll never find?
Quoted 8 lines
Hmm. I just took existing logic from check:
[..]
case "$QEMU_PROG" in*qemu-system-arm|*qemu-system-aarch64) export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt" ;;[..]
What I mean is that the code below doesn't look like it's prepared to interpret a tuple like ('arm', 'aarch64'), it expects a single string:
Quoted 7 lines
Quoted 7 lines
tests/qemu-iotests/testenv.py line 252
Quoted 7 lines
tests/qemu-iotests/testenv.py new file +6
-0+ ('avr', 'mega2560'), + ('rx', 'gdbsim-r5f562n8'), + ('tricore', 'tricore_testboard') + ) + for suffix, machine in machine_map: + if self.qemu_prog.endswith(f'qemu-system-{suffix}'):
Here we get effectively:
suffix: Tuple[str, str] = ('arm', 'aarch64')The formatted string uses str(suffix), which makes the result "qemu-system-('arm', 'aarch64')".
Or am I misunderstanding something here?
Quoted 71 lines
Quoted 71 lines
Quoted 71 lines
tests/qemu-iotests/testenv.py new file +71
-0+ self.qemu_options += f' -machine {machine}' + + # QEMU_DEFAULT_MACHINE + self.qemu_default_machine = get_default_machine(self.qemu_prog) + + self.qemu_img_options = os.getenv('QEMU_IMG_OPTIONS') + self.qemu_nbd_options = os.getenv('QEMU_NBD_OPTIONS') + + is_generic = self.imgfmt not in ['bochs', 'cloop', 'dmg'] + self.imgfmt_generic = 'true' if is_generic else 'false' + + self.qemu_io_options = f'--cache {self.cachemode} --aio {self.aiomode}' + if self.misalign: + self.qemu_io_options += ' --misalign' + + self.qemu_io_options_no_fmt = self.qemu_io_options + + if self.imgfmt == 'luks': + self.imgoptssyntax = 'true' + self.imgkeysecret = '123456' + if not self.imgopts: + self.imgopts = 'iter-time=10' + elif 'iter-time=' not in self.imgopts: + self.imgopts += ',iter-time=10' + else: + self.imgoptssyntax = 'false' + self.qemu_io_options += ' -f ' + self.imgfmt + + if self.imgfmt == 'vmkd': + if not self.imgopts: + self.imgopts = 'zeroed_grain=on' + elif 'zeroed_grain=' not in self.imgopts: + self.imgopts += ',zeroed_grain=on' + + def close(self) -> None: + if self.tmp_sock_dir: + shutil.rmtree(self.sock_dir) + + def __enter__(self) -> 'TestEnv': + return self + + def __exit__(self, *args) -> None: + self.close() + + def print_env(self) -> None: + template = """\ +QEMU -- "{QEMU_PROG}" {QEMU_OPTIONS} +QEMU_IMG -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS} +QEMU_IO -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS} +QEMU_NBD -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS} +IMGFMT -- {IMGFMT}{imgopts} +IMGPROTO -- {IMGPROTO} +PLATFORM -- {platform} +TEST_DIR -- {TEST_DIR} +SOCK_DIR -- {SOCK_DIR} +SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}""" + + args = collections.defaultdict(str, self.get_env()) + + if 'IMGOPTS' in args: + args['imgopts'] = f" ({args['IMGOPTS']})" + + u = os.uname() + args['platform'] = f'{u.sysname}/{u.machine} {u.nodename} {u.release}' + + print(template.format_map(args)) + + +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: + TestEnv.get_argparser().print_help()
Quoted 8 lines
Quoted 5 lines
tests/qemu-iotests/testenv.py line 328
Quoted 5 lines
tests/qemu-iotests/testenv.py new file +5
-0+ exit() + + with TestEnv(sys.argv) as te: + te.print_env() + print('\nUnhandled options: ', te.remaining_argv)Thanks for reviewing! I hope to post v7 today, with cmdline interface in 'check' script.
Sounds good. Then I'll continue the review when v7 is on the list.
Kevin
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 18 lines · Kevin Wolf
Am 15.01.2021 um 13:19 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 17 lines
Quoted 16 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 15 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/testenv.py | 328 ++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+)create mode 100755
tests/qemu-iotests/testenv.py
[..]
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
tests/qemu-iotests/testenv.py new file +7
-0+ def init_binaries(self): + """Init binary path variables: + PYTHON (for bash tests) + QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG + SOCKET_SCM_HELPER + """ + self.python = '/usr/bin/python3 -B'
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Oh, I missed the change. Then I should just drop this self.python.
Do we still get the value from elsewhere or do we need to manually parse common.env?
Hmm.. Good question. We have either parse common.env, and still create self.python variable.
Or drop it, and include common.env directly to bash tests. For this we'll need to export
BUILD_IOTESTS, and do
. $BUILD_IOTESTS/common.env
in common.rc..
Quoted 78 lines
Quoted 58 lines
Quoted 49 lines
Quoted 49 lines
tests/qemu-iotests/testenv.py new file +47
-0+ def root(*names): + return os.path.join(self.build_root, *names) + + arch = os.uname().machine + if 'ppc64' in arch: + arch = 'ppc64' + + self.qemu_prog = os.getenv('QEMU_PROG', root(f'qemu-system-{arch}')) + self.qemu_img_prog = os.getenv('QEMU_IMG_PROG', root('qemu-img')) + self.qemu_io_prog = os.getenv('QEMU_IO_PROG', root('qemu-io')) + self.qemu_nbd_prog = os.getenv('QEMU_NBD_PROG', root('qemu-nbd')) + self.qsd_prog = os.getenv('QSD_PROG', root('storage-daemon', + 'qemu-storage-daemon')) + + for b in [self.qemu_img_prog, self.qemu_io_prog, self.qemu_nbd_prog, + self.qemu_prog, self.qsd_prog]: + if not os.path.exists(b): + exit('Not such file: ' + b) + if not os.access(b, os.X_OK): + exit('Not executable: ' + b) + + helper_path = os.path.join(self.build_iotests, 'socket_scm_helper') + if os.access(helper_path, os.X_OK): + self.socket_scm_helper = helper_path # SOCKET_SCM_HELPER + + def __init__(self, argv: List[str]) -> None: + """Parse args and environment""" + + # Initialize generic paths: build_root, build_iotests, source_iotests, + # which are needed to initialize some environment variables. They are + # used by init_*() functions as well. + + + if os.path.islink(sys.argv[0]): + # called from the build tree + self.source_iotests = os.path.dirname(os.readlink(sys.argv[0])) + self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0])) + else: + # called from the source tree + self.source_iotests = os.getcwd() + self.build_iotests = self.source_iotests + + self.build_root = os.path.join(self.build_iotests, '..', '..') + + self.init_handle_argv(argv) + self.init_directories() + self.init_binaries()Quoted 8 lines
tests/qemu-iotests/testenv.py line 246
Quoted 5 lines
tests/qemu-iotests/testenv.py new file +5
-0+ + # QEMU_OPTIONS + self.qemu_options = '-nodefaults -display none -accel qtest' + machine_map = ( + (('arm', 'aarch64'), 'virt'),How does this work? Won't we check for "qemu-system-('arm', 'aarch64')" below, which we'll never find?
Quoted 8 lines
Hmm. I just took existing logic from check:
[..]
case "$QEMU_PROG" in*qemu-system-arm|*qemu-system-aarch64) export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt" ;;[..]
What I mean is that the code below doesn't look like it's prepared to interpret a tuple like ('arm', 'aarch64'), it expects a single string:
Quoted 7 lines
Quoted 7 lines
tests/qemu-iotests/testenv.py line 252
Quoted 7 lines
tests/qemu-iotests/testenv.py new file +6
-0+ ('avr', 'mega2560'), + ('rx', 'gdbsim-r5f562n8'), + ('tricore', 'tricore_testboard') + ) + for suffix, machine in machine_map: + if self.qemu_prog.endswith(f'qemu-system-{suffix}'):
Quoted 8 lines
Here we get effectively:
suffix: Tuple[str, str] = ('arm', 'aarch64')The formatted string uses str(suffix), which makes the result "qemu-system-('arm', 'aarch64')".
Or am I misunderstanding something here?
Ah, you are right:) Will fix. I interpreted your
Won't we check for "qemu-system-('arm', 'aarch64')"
as
Won't we check for "qemu-system-arm" or "qemu-system-aarch64"
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
Am 15.01.2021 um 14:10 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 38 lines
Quoted 18 lines · Kevin Wolf
Am 15.01.2021 um 13:19 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 17 lines
Quoted 16 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 15 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/testenv.py | 328 ++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+)create mode 100755
tests/qemu-iotests/testenv.py[..]
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
tests/qemu-iotests/testenv.py new file +7
-0+ def init_binaries(self): + """Init binary path variables: + PYTHON (for bash tests) + QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG + SOCKET_SCM_HELPER + """ + self.python = '/usr/bin/python3 -B'Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Oh, I missed the change. Then I should just drop this self.python.
Do we still get the value from elsewhere or do we need to manually parse common.env?
Quoted 8 lines
Hmm.. Good question. We have either parse common.env, and still create self.python variable.
Or drop it, and include common.env directly to bash tests. For this we'll need to export
BUILD_IOTESTS, and do
. $BUILD_IOTESTS/common.envin common.rc..
check uses it, too, for running Python test cases.
Kevin
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 41 lines · Kevin Wolf
Am 15.01.2021 um 14:10 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 40 lines
Quoted 18 lines · Kevin Wolf
Am 15.01.2021 um 13:19 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 17 lines
Quoted 16 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 15 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/testenv.py | 328 ++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+)create mode 100755
tests/qemu-iotests/testenv.py[..]
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
tests/qemu-iotests/testenv.py new file +7
-0+ def init_binaries(self): + """Init binary path variables: + PYTHON (for bash tests) + QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG + SOCKET_SCM_HELPER + """ + self.python = '/usr/bin/python3 -B'Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Oh, I missed the change. Then I should just drop this self.python.
Do we still get the value from elsewhere or do we need to manually parse common.env?
Hmm.. Good question. We have either parse common.env, and still create self.python variable.
Quoted 9 lines
Quoted 6 lines
Or drop it, and include common.env directly to bash tests. For this we'll need to export
BUILD_IOTESTS, and do
. $BUILD_IOTESTS/common.envin common.rc..
check uses it, too, for running Python test cases.
But new check (written in python) doesn't.. Should I keep bash check, which will have only one line to call check.py with help of PYTHON?
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 47 lines · Vladimir Sementsov-Ogievskiy
Quoted 46 lines · Kevin Wolf
Am 15.01.2021 um 14:10 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 45 lines
Quoted 18 lines · Kevin Wolf
Am 15.01.2021 um 13:19 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 17 lines
Quoted 16 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 15 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
tests/qemu-iotests/testenv.py| 328 ++++++++++++++++++++++++++++++++++1 file changed, 328 insertions(+)create mode 100755
tests/qemu-iotests/testenv.py[..]
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
+ def
init_binaries(self):
+ """Init binary path variables:
+ PYTHON (for bash tests)
+QEMU_PROG,QEMU_IMG_PROG,QEMU_IO_PROG,QEMU_NBD_PROG,QSD_PROG+SOCKET_SCM_HELPER
+ """
+ self.python = '/usr/bin/python3-B'Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Oh, I missed the change. Then I should just drop this self.python.
Do we still get the value from elsewhere or do we need to manually parse common.env?
Hmm.. Good question. We have either parse common.env, and still create self.python variable.
Or drop it, and include common.env directly to bash tests. For this we'll need to export
BUILD_IOTESTS, and do
. $BUILD_IOTESTS/common.env
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
in common.rc..
check uses it, too, for running Python test cases.
But new check (written in python) doesn't.. Should I keep bash check, which will have only one line to call
check.pywith help of PYTHON?
Or finally, may be just drop it? Can we just use system python for tests, now when we are already in a python3 world?
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 50 lines · Vladimir Sementsov-Ogievskiy
Quoted 49 lines · Vladimir Sementsov-Ogievskiy
Quoted 48 lines · Kevin Wolf
Am 15.01.2021 um 14:10 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 46 lines
Quoted 18 lines · Kevin Wolf
Am 15.01.2021 um 13:19 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 17 lines
Quoted 16 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 15 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
tests/qemu-iotests/testenv.py| 328 ++++++++++++++++++++++++++++++++++1 file changed, 328 insertions(+)create mode 100755
tests/qemu-iotests/testenv.py[..]
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
+ def
init_binaries(self):
+ """Init binary path variables:
+ PYTHON (for bash tests)
+QEMU_PROG,QEMU_IMG_PROG,QEMU_IO_PROG,QEMU_NBD_PROG,QSD_PROG+SOCKET_SCM_HELPER
+ """
+ self.python = '/usr/bin/python3-B'Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Oh, I missed the change. Then I should just drop this self.python.
Do we still get the value from elsewhere or do we need to manually parse common.env?
Hmm.. Good question. We have either parse common.env, and still create self.python variable.
Or drop it, and include common.env directly to bash tests. For this we'll need to export
BUILD_IOTESTS, and do
. $BUILD_IOTESTS/common.envin common.rc..
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
check uses it, too, for running Python test cases.
But new check (written in python) doesn't.. Should I keep bash check, which will have only one line to call
check.pywith help of PYTHON?Or finally, may be just drop it? Can we just use system python for tests, now when we are already in a python3 world?
Oh, I know. We just need to use "self.python = sys.executable", so that tests uses the interpreter that runs check.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 08/11] iotests: add testenv.py
In reply to Vladimir Sementsov-OgievskiyAm 16.01.2021 um 12:03 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 53 lines
Quoted 52 lines · Vladimir Sementsov-Ogievskiy
Quoted 50 lines · Kevin Wolf
Am 15.01.2021 um 14:10 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 38 lines
Quoted 18 lines · Kevin Wolf
Am 15.01.2021 um 13:19 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 17 lines
Quoted 16 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 15 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
  Âtests/qemu-iotests/testenv.py| 328 ++++++++++++++++++++++++++++++++++    1 file changed, 328 insertions(+)
   create mode 100755tests/qemu-iotests/testenv.py[..]
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
+Â Â Â def
init_binaries(self):
+Â Â Â Â Â Â Â """Init binary path variables:
+Â Â Â Â Â Â Â Â Â Â Â Â PYTHON (for bash tests)
+Â Â Â Â Â Â Â Â Â Â Â ÂQEMU_PROG,QEMU_IMG_PROG,QEMU_IO_PROG,QEMU_NBD_PROG,QSD_PROG+Â Â Â Â Â Â Â Â Â Â Â ÂSOCKET_SCM_HELPER
+Â Â Â Â Â Â Â """
+Â Â Â Â Â Â Â self.python = '/usr/bin/python3-B'Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Oh, I missed the change. Then I should just drop this self.python.
Do we still get the value from elsewhere or do we need to manually parse common.env?
Quoted 8 lines
Hmm.. Good question. We have either parse common.env, and still create self.python variable.
Or drop it, and include common.env directly to bash tests. For this we'll need to export
BUILD_IOTESTS, and do
 . $BUILD_IOTESTS/common.envin common.rc..
check uses it, too, for running Python test cases.
Quoted 6 lines
Quoted 3 lines
But new check (written in python) doesn't.. Should I keep bash check, which will have only one line to call
check.pywith help of PYTHON?Or finally, may be just drop it? Can we just use system python for tests, now when we are already in a python3 world?
You can only assume the Python 3 (or more specifically 3.6+) world if you are using the Python interpreter that was passed to configure. This will commonly be the same thing as the first python3 in PATH, but it doesn't have to be.
So your solution of just using the same interpreter as for check might be okay as long as we make sure that 'make check' calls check with the configured Python interpreter instead of relying on the shebang line.
Kevin
Re: [PATCH v6 08/11] iotests: add testenv.py
Quoted 61 lines · Kevin Wolf
Am 16.01.2021 um 12:03 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 53 lines
Quoted 52 lines · Vladimir Sementsov-Ogievskiy
Quoted 50 lines · Kevin Wolf
Am 15.01.2021 um 14:10 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 38 lines
Quoted 18 lines · Kevin Wolf
Am 15.01.2021 um 13:19 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 17 lines
Quoted 16 lines · Kevin Wolf
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 15 lines
Add TestEnv class, which will handle test environment in a new python iotests running framework.
Difference with current ./check interface:
- -v (verbose) option dropped, as it is unused- -xdiff option is dropped, until somebody complains that it is needed
- same for -n optionSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
  Âtests/qemu-iotests/testenv.py| 328 ++++++++++++++++++++++++++++++++++    1 file changed, 328 insertions(+)
   create mode 100755tests/qemu-iotests/testenv.py[..]
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
+Â Â Â def
init_binaries(self):
+Â Â Â Â Â Â Â """Init binary path variables:
+Â Â Â Â Â Â Â Â Â Â Â Â PYTHON (for bash tests)
+Â Â Â Â Â Â Â Â Â Â Â ÂQEMU_PROG,QEMU_IMG_PROG,QEMU_IO_PROG,QEMU_NBD_PROG,QSD_PROG+Â Â Â Â Â Â Â Â Â Â Â ÂSOCKET_SCM_HELPER
+Â Â Â Â Â Â Â """
+Â Â Â Â Â Â Â self.python = '/usr/bin/python3-B'Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This doesn't look right, we need to respect the Python binary set in configure (which I think we get from common.env)
Oh, I missed the change. Then I should just drop this self.python.
Do we still get the value from elsewhere or do we need to manually parse common.env?
Quoted 8 lines
Hmm.. Good question. We have either parse common.env, and still create self.python variable.
Or drop it, and include common.env directly to bash tests. For this we'll need to export
BUILD_IOTESTS, and do
 . $BUILD_IOTESTS/common.envin common.rc..
check uses it, too, for running Python test cases.
Quoted 6 lines
Quoted 3 lines
But new check (written in python) doesn't.. Should I keep bash check, which will have only one line to call
check.pywith help of PYTHON?Or finally, may be just drop it? Can we just use system python for tests, now when we are already in a python3 world?
Quoted 9 lines
You can only assume the Python 3 (or more specifically 3.6+) world if you are using the Python interpreter that was passed to configure. This will commonly be the same thing as the first python3 in PATH, but it doesn't have to be.
So your solution of just using the same interpreter as for check might be okay as long as we make sure that 'make check' calls check with the configured Python interpreter instead of relying on the shebang line.
I've sent v7 with exactly this thing: use same interpreter as for check and adjust check-block.sh which is called from make check
Signature · 2 lines
Best regards, Vladimir
PATCH v6 9/11 iotests: add testrunner.py
In reply to Vladimir Sementsov-OgievskiyAdd TestRunner class, which will run tests in a new python iotests running framework.
There are some differences with current ./check behavior, most significant are:
- Consider all tests self-executable, just run them, don't run python by hand.
- Elapsed time is cached in json file
- Elapsed time precision increased a bit
- use python difflib instead of "diff -w", to ignore spaces at line ends strip lines by hand. Do not ignore other spaces.
--- tests/qemu-iotests/testrunner.py | 351 +++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) create mode 100644 tests/qemu-iotests/testrunner.py
tests/qemu-iotests/testrunner.py new file +351 -0
@@ -0,0 +1,351 @@ +# Class for actual tests running. +# +# Copyright (c) 2020 Virtuozzo International GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import os +import random +from pathlib import Path +import datetime +import time +import difflib +import subprocess +import collections +import contextlib +import json +import argparse +import termios +import sys +from contextlib import contextmanager +from typing import List, Optional, Iterator + +from testenv import TestEnv + + +def silent_unlink(path: Path) -> None: + try: + path.unlink() + except OSError: + pass + + +def file_diff(file1: str, file2: str) -> List[str]: + with open(file1) as f1, open(file2) as f2: + # We want to ignore spaces at line ends. There are a lot of mess about + # it in iotests. + # TODO: fix all tests to not produce extra spaces, fix all .out files + # and use strict diff here! + seq1 = [line.rstrip() for line in f1] + seq2 = [line.rstrip() for line in f2] + return list(difflib.unified_diff(seq1, seq2, file1, file2)) + + +# We want to save current tty settings during test run, +# since an aborting qemu call may leave things screwed up. +@contextmanager +def savetty() -> Iterator: + isterm = sys.stdin.isatty() + if isterm: + fd = sys.stdin.fileno() + attr = termios.tcgetattr(0) + + try: + yield + finally: + if isterm: + termios.tcsetattr(fd, termios.TCSADRAIN, attr) + + +class LastElapsedTime: + """ Cache for elapsed time for tests, to show it during new test run + + Use get() in any time. But, if use update you should then call save(), + or use update() inside with-block. + """ + def __init__(self, cache_file: str, env: TestEnv) -> None: + self.env = env + self.cache_file = cache_file + + try: + with open(cache_file) as f: + self.cache = json.load(f) + except (OSError, ValueError): + self.cache = {} + + def get(self, test: str, + default: Optional[float] = None) -> Optional[float]: + if test not in self.cache: + return default + + if self.env.imgproto not in self.cache[test]: + return default + + return self.cache[test][self.env.imgproto].get(self.env.imgfmt, + default) + + def update(self, test: str, elapsed: float) -> None: + d = self.cache.setdefault(test, {}) + d = d.setdefault(self.env.imgproto, {}) + d[self.env.imgfmt] = elapsed + + def save(self) -> None: + with open(self.cache_file, 'w') as f: + json.dump(self.cache, f) + + def __enter__(self) -> 'LastElapsedTime': + return self + + def __exit__(self, *args) -> None: + self.save() + + +TestResult = collections.namedtuple( + 'TestResult', + ['status', 'description', 'elapsed', 'diff', 'casenotrun'], + defaults=('', '', '', '')) + + +class TestRunner: + _argparser = None + @classmethod + def get_argparser(cls) -> argparse.ArgumentParser: + if cls._argparser is not None: + return cls._argparser + + p = argparse.ArgumentParser(description="= test running options =", + add_help=False, usage=argparse.SUPPRESS) + + p.add_argument('-makecheck', action='store_true', + help='pretty print output for make check') + + cls._argparser = p + return p + + def __init__(self, argv: List[str], env: TestEnv) -> None: + self.env = env + self.test_run_env = self.env.get_env() + if 'MALLOC_PERTURB_' not in os.environ and \ + 'MALLOC_PERTURB_' not in self.test_run_env: + x = random.randrange(1, 255) + self.test_run_env['MALLOC_PERTURB_'] = str(x) + + args, self.remaining_argv = self.get_argparser().parse_known_args(argv) + self.makecheck = args.makecheck + + self.last_elapsed = LastElapsedTime('.last-elapsed-cache', env) + + def __enter__(self) -> 'TestRunner': + self._stack = contextlib.ExitStack() + self._stack.enter_context(self.env) + self._stack.enter_context(self.last_elapsed) + self._stack.enter_context(savetty()) + return self + + def __exit__(self, *args) -> None: + self._stack.close() + + def test_print_one_line(self, test: str, starttime: str, + endtime: Optional[str] = None, status: str = '...', + lasttime: Optional[float] = None, + thistime: Optional[str] = None, + description: str = '', + test_field_width: Optional[int] = None, + end: str = '\n') -> None: + """ Print short test info before/after test run """ + test = os.path.basename(test) + + if test_field_width is None: + test_field_width = 8 + + if self.makecheck and status != '...': + if status and status != 'pass': + status = f' [{status}]' + else: + status = '' + + print(f' TEST iotest-{self.env.imgfmt}: {test}{status}') + return + + if lasttime: + lasttime_s = f' (last: {lasttime}s)' + else: + lasttime_s = '' + if thistime: + thistime = f'{thistime:.1f}s' + else: + thistime = '...' + + if endtime: + endtime = f'[{endtime}]' + else: + endtime = '' + + if status == 'pass': + col = '\033[32m' + elif status == 'fail': + col = '\033[1m\033[31m' + elif status == 'not run': + col = '\033[33m' + else: + col = '' + + col_end = '\033[0m' + + print(f'{test:{test_field_width}} {col}{status:10}{col_end} ' + f'[{starttime}] {endtime:13}{thistime:5} {lasttime_s:14} ' + f'{description}', end=end) + + def find_reference(self, test: str) -> str: + if self.env.cachemode == 'none': + ref = f'{test}.out.nocache' + if os.path.isfile(ref): + return ref + + ref = f'{test}.out.{self.env.imgfmt}' + if os.path.isfile(ref): + return ref + + ref = f'{test}.{self.env.qemu_default_machine}.out' + if os.path.isfile(ref): + return ref + + return f'{test}.out' + + def do_run_test(self, test: str) -> TestResult: + f_test = Path(test) + f_bad = Path(f_test.name + '.out.bad') + f_notrun = Path(f_test.name + '.notrun') + f_casenotrun = Path(f_test.name + '.casenotrun') + f_reference = Path(self.find_reference(test)) + + if not f_test.exists(): + return TestResult(status='fail', + description=f'No such test file: {f_test}') + + if not os.access(str(f_test), os.X_OK): + exit(f'Not executable: {f_test}') + + if not f_reference.exists(): + return TestResult(status='fail', + description='No qualified output ' + f'(expected {f_reference})') + + for p in (f_bad, f_notrun, f_casenotrun): + silent_unlink(p) + + args = [str(f_test.resolve())] + if self.env.debug: + args.append('-d') + + env = os.environ.copy() + env.update(self.test_run_env) + + t0 = time.time() + with f_bad.open('w') as f: + ret = subprocess.run(args, cwd=str(f_test.parent), env=env, + stdout=f, stderr=subprocess.STDOUT).returncode + elapsed = round(time.time() - t0, 1) + + if ret != 0: + return TestResult(status='fail', elapsed=elapsed, + description=f'failed, exit status {ret}', + diff=file_diff(str(f_reference), str(f_bad))) + + if f_notrun.exists(): + return TestResult(status='not run', elapsed=elapsed, + description=f_notrun.read_text().strip()) + + casenotrun = None + if f_casenotrun.exists(): + casenotrun = f_casenotrun.read_text() + + diff = file_diff(str(f_reference), str(f_bad)) + if diff: + return TestResult(status='fail', elapsed=elapsed, + description='output mismatch (see {f_bad})', + diff=diff, casenotrun=casenotrun) + else: + f_bad.unlink() + self.last_elapsed.update(test, elapsed) + return TestResult(status='pass', elapsed=elapsed, + casenotrun=casenotrun) + + def run_test(self, test: str, + test_field_width: Optional[int] = None) -> TestResult: + last_el = self.last_elapsed.get(test) + start = datetime.datetime.now().strftime('%H:%M:%S') + + self.test_print_one_line(test=test, starttime=start, lasttime=last_el, + end='\r', test_field_width=test_field_width) + + res = self.do_run_test(test) + + end = datetime.datetime.now().strftime('%H:%M:%S') + self.test_print_one_line(test=test, status=res.status, + starttime=start, endtime=end, + lasttime=last_el, thistime=res.elapsed, + description=res.description, + test_field_width=test_field_width) + + if res.casenotrun: + print(res.casenotrun) + + return res + + def run_tests(self, tests: List[str]) -> None: + n_run = 0 + failed = [] + notrun = [] + casenotrun = [] + + if not self.makecheck: + self.env.print_env() + print() + + test_field_width = max(len(os.path.basename(t)) for t in tests) + 2 + + for t in tests: + name = os.path.basename(t) + res = self.run_test(t, test_field_width=test_field_width) + + assert res.status in ('pass', 'fail', 'not run') + + if res.casenotrun: + casenotrun.append(t) + + if res.status != 'not run': + n_run += 1 + + if res.status == 'fail': + failed.append(name) + if self.makecheck: + self.env.print_env() + if res.diff: + print('\n'.join(res.diff)) + elif res.status == 'not run': + notrun.append(name) + + if notrun: + print('Not run:', ' '.join(notrun)) + + if casenotrun: + print('Some cases not run in:', ' '.join(casenotrun)) + + if failed: + print('Failures:', ' '.join(failed)) + print(f'Failed {len(failed)} of {n_run} iotests') + else: + print(f'Passed all {n_run} iotests')
Signature · 1 line
2.29.2
PATCH v6 10/11 iotests: rewrite check into python
In reply to Vladimir Sementsov-OgievskiyJust use classes introduced in previous three commits. Behavior difference is described in these three commits.
Drop group file, as it becomes unused.
--- tests/qemu-iotests/check | 994 ++------------------------------------- tests/qemu-iotests/group | 321 ------------- 2 files changed, 28 insertions(+), 1287 deletions(-) delete mode 100644 tests/qemu-iotests/group
tests/qemu-iotests/check +28 -966
@@ -1,7 +1,8 @@ -#!/usr/bin/env bash +#!/usr/bin/env python3 # -# Copyright (C) 2009 Red Hat, Inc. -# Copyright (c) 2000-2002,2006 Silicon Graphics, Inc. All Rights Reserved. +# Configure environment and run group of tests in it. +# +# Copyright (c) 2020 Virtuozzo International GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as
@@ -14,967 +15,28 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# -# Control script for QA -# - -status=0 -needwrap=true -try=0 -n_bad=0 -bad="" -notrun="" -casenotrun="" -interrupt=true -makecheck=false - -_init_error() -{ - echo "check: $1" >&2 - exit 1 -} - -if [ -L "$0" ] -then - # called from the build tree - source_iotests=$(dirname "$(readlink "$0")") - if [ -z "$source_iotests" ] - then - _init_error "failed to obtain source tree name from check symlink" - fi - source_iotests=$(cd "$source_iotests"; pwd) || _init_error "failed to enter source tree" - build_iotests=$(cd "$(dirname "$0")"; pwd) -else - # called from the source tree - source_iotests=$PWD - # this may be an in-tree build (note that in the following code we may not - # assume that it truly is and have to test whether the build results - # actually exist) - build_iotests=$PWD -fi - -build_root="$build_iotests/../.." - -# we need common.env -if ! . "$build_iotests/common.env" -then - _init_error "failed to source common.env (make sure the qemu-iotests are run from tests/qemu-iotests in the build tree)" -fi - -# we need common.config -if ! . "$source_iotests/common.config" -then - _init_error "failed to source common.config" -fi - -_full_imgfmt_details() -{ - if [ -n "$IMGOPTS" ]; then - echo "$IMGFMT ($IMGOPTS)" - else - echo "$IMGFMT" - fi -} - -_full_platform_details() -{ - os=$(uname -s) - host=$(hostname -s) - kernel=$(uname -r) - platform=$(uname -m) - echo "$os/$platform $host $kernel" -} - -_full_env_details() -{ - cat <<EOF -QEMU -- "$QEMU_PROG" $QEMU_OPTIONS -QEMU_IMG -- "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS -QEMU_IO -- "$QEMU_IO_PROG" $QEMU_IO_OPTIONS -QEMU_NBD -- "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS -IMGFMT -- $FULL_IMGFMT_DETAILS -IMGPROTO -- $IMGPROTO -PLATFORM -- $FULL_HOST_DETAILS -TEST_DIR -- $TEST_DIR -SOCK_DIR -- $SOCK_DIR -SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER - -EOF -} - -# $1 = prog to look for -set_prog_path() -{ - p=$(command -v $1 2> /dev/null) - if [ -n "$p" -a -x "$p" ]; then - type -p "$p" - else - return 1 - fi -} - -if [ -z "$TEST_DIR" ]; then - TEST_DIR=$PWD/scratch -fi -mkdir -p "$TEST_DIR" || _init_error 'Failed to create TEST_DIR' - -tmp_sock_dir=false -if [ -z "$SOCK_DIR" ]; then - SOCK_DIR=$(mktemp -d) - tmp_sock_dir=true -fi -mkdir -p "$SOCK_DIR" || _init_error 'Failed to create SOCK_DIR' - -diff="diff -u" -verbose=false -debug=false -group=false -xgroup=false -imgopts=false -showme=false -sortme=false -expunge=true -have_test_arg=false -cachemode=false -aiomode=false - -tmp="${TEST_DIR}"/$$ -rm -f $tmp.list $tmp.tmp $tmp.sed - -export IMGFMT=raw -export IMGFMT_GENERIC=true -export IMGPROTO=file -export IMGOPTS="" -export CACHEMODE="writeback" -export AIOMODE="threads" -export QEMU_IO_OPTIONS="" -export QEMU_IO_OPTIONS_NO_FMT="" -export CACHEMODE_IS_DEFAULT=true -export VALGRIND_QEMU= -export IMGKEYSECRET= -export IMGOPTSSYNTAX=false - -# Save current tty settings, since an aborting qemu call may leave things -# screwed up -STTY_RESTORE= -if test -t 0; then - STTY_RESTORE=$(stty -g) -fi - -for r -do - - if $group - then - # arg after -g - group_list=$(sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{ -s/ .*//p -}') - if [ -z "$group_list" ] - then - echo "Group \"$r\" is empty or not defined?" - exit 1 - fi - [ ! -s $tmp.list ] && touch $tmp.list - for t in $group_list - do - if grep -s "^$t\$" $tmp.list >/dev/null - then - : - else - echo "$t" >>$tmp.list - fi - done - group=false - continue - - elif $xgroup - then - # arg after -x - # Populate $tmp.list with all tests - awk '/^[0-9]{3,}/ {print $1}' "${source_iotests}/group" > $tmp.list 2>/dev/null - group_list=$(sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{ -s/ .*//p -}') - if [ -z "$group_list" ] - then - echo "Group \"$r\" is empty or not defined?" - exit 1 - fi - numsed=0 - rm -f $tmp.sed - for t in $group_list - do - if [ $numsed -gt 100 ] - then - sed -f $tmp.sed <$tmp.list >$tmp.tmp - mv $tmp.tmp $tmp.list - numsed=0 - rm -f $tmp.sed - fi - echo "/^$t\$/d" >>$tmp.sed - numsed=$(expr $numsed + 1) - done - sed -f $tmp.sed <$tmp.list >$tmp.tmp - mv $tmp.tmp $tmp.list - xgroup=false - continue - - elif $imgopts - then - IMGOPTS="$r" - imgopts=false - continue - elif $cachemode - then - CACHEMODE="$r" - CACHEMODE_IS_DEFAULT=false - cachemode=false - continue - elif $aiomode - then - AIOMODE="$r" - aiomode=false - continue - fi - - xpand=true - case "$r" - in - - -\? | -h | --help) # usage - echo "Usage: $0 [options] [testlist]"' - -common options - -v verbose - -d debug - -image format options - -raw test raw (default) - -bochs test bochs - -cloop test cloop - -parallels test parallels - -qcow test qcow - -qcow2 test qcow2 - -qed test qed - -vdi test vdi - -vpc test vpc - -vhdx test vhdx - -vmdk test vmdk - -luks test luks - -dmg test dmg - -image protocol options - -file test file (default) - -rbd test rbd - -sheepdog test sheepdog - -nbd test nbd - -fuse test fuse - -ssh test ssh - -nfs test nfs - -other options - -xdiff graphical mode diff - -nocache use O_DIRECT on backing file - -misalign misalign memory allocations - -n show me, do not run tests - -o options -o options to pass to qemu-img create/convert - -c mode cache mode - -i mode AIO mode - -makecheck pretty print output for make check - -testlist options - -g group[,group...] include tests from these groups - -x group[,group...] exclude tests from these groups - NNN include test NNN - NNN-NNN include test range (eg. 012-021) -' - exit 0 - ;; - - -raw) - IMGFMT=raw - xpand=false - ;; - - -bochs) - IMGFMT=bochs - IMGFMT_GENERIC=false - xpand=false - ;; - - -cloop) - IMGFMT=cloop - IMGFMT_GENERIC=false - xpand=false - ;; - - -parallels) - IMGFMT=parallels - xpand=false - ;; - - -qcow) - IMGFMT=qcow - xpand=false - ;; - - -qcow2) - IMGFMT=qcow2 - xpand=false - ;; - - -luks) - IMGOPTSSYNTAX=true - IMGFMT=luks - IMGKEYSECRET=123456 - xpand=false - ;; - - -dmg) - IMGFMT=dmg - IMGFMT_GENERIC=false - xpand=false - ;; - - -qed) - IMGFMT=qed - xpand=false - ;; - - -vdi) - IMGFMT=vdi - xpand=false - ;; - - -vmdk) - IMGFMT=vmdk - xpand=false - ;; - - -vpc) - IMGFMT=vpc - xpand=false - ;; - - -vhdx) - IMGFMT=vhdx - xpand=false - ;; - - -file) - IMGPROTO=file - xpand=false - ;; - - -rbd) - IMGPROTO=rbd - xpand=false - ;; - - -sheepdog) - IMGPROTO=sheepdog - xpand=false - ;; - - -nbd) - IMGPROTO=nbd - xpand=false - ;; - - -fuse) - IMGPROTO=fuse - xpand=false - ;; - - -ssh) - IMGPROTO=ssh - xpand=false - ;; - - -nfs) - IMGPROTO=nfs - xpand=false - ;; - - -nocache) - CACHEMODE="none" - CACHEMODE_IS_DEFAULT=false - xpand=false - ;; - - -misalign) - QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --misalign" - xpand=false - ;; - - -valgrind) - VALGRIND_QEMU='y' - xpand=false - ;; - - -g) # -g group ... pick from group file - group=true - xpand=false - ;; - - -xdiff) # graphical diff mode - xpand=false - - if [ ! -z "$DISPLAY" ] - then - command -v xdiff >/dev/null 2>&1 && diff=xdiff - command -v gdiff >/dev/null 2>&1 && diff=gdiff - command -v tkdiff >/dev/null 2>&1 && diff=tkdiff - command -v xxdiff >/dev/null 2>&1 && diff=xxdiff - fi - ;; - -makecheck) # makecheck friendly output - makecheck=true - xpand=false - ;; - -n) # show me, don't do it - showme=true - xpand=false - ;; - -o) - imgopts=true - xpand=false - ;; - -c) - cachemode=true - xpand=false - ;; - -i) - aiomode=true - xpand=false - ;; - -T) # deprecated timestamp option - xpand=false - ;; - -v) - verbose=true - xpand=false - ;; - -d) - debug=true - xpand=false - ;; - -x) # -x group ... exclude from group file - xgroup=true - xpand=false - ;; - '[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]') - echo "No tests?" - status=1 - exit $status - ;; - - [0-9]*-[0-9]*) - eval $(echo $r | sed -e 's/^/start=/' -e 's/-/ end=/') - ;; - - [0-9]*-) - eval $(echo $r | sed -e 's/^/start=/' -e 's/-//') - end=$(echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //') - if [ -z "$end" ] - then - echo "No tests in range \"$r\"?" - status=1 - exit $status - fi - ;; - - *) - start=$r - end=$r - ;; - - esac - - # get rid of leading 0s as can be interpreted as octal - start=$(echo $start | sed 's/^0*//') - end=$(echo $end | sed 's/^0*//') - - if $xpand - then - have_test_arg=true - awk </dev/null ' -BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \ - | while read id - do - if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null - then - # in group file ... OK - echo $id >>$tmp.list - else - if [ -f expunged ] && $expunge && egrep "^$id([ ]|\$)" expunged >/dev/null - then - # expunged ... will be reported, but not run, later - echo $id >>$tmp.list - else - # oops - if [ "$start" == "$end" -a "$id" == "$end" ] - then - echo "$id - unknown test" - exit 1 - else - echo "$id - unknown test, ignored" - fi - fi - fi - done || exit 1 - fi - -done - -# Set qemu-io cache mode with $CACHEMODE we have -QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --cache $CACHEMODE" -# Set qemu-io aio mode with $AIOMODE we have -QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --aio $AIOMODE" - -QEMU_IO_OPTIONS_NO_FMT="$QEMU_IO_OPTIONS" -if [ "$IMGOPTSSYNTAX" != "true" ]; then - QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS -f $IMGFMT" -fi - -# Set default options for qemu-img create -o if they were not specified -if [ "$IMGFMT" == "qcow2" ] && ! (echo "$IMGOPTS" | grep "compat=" > /dev/null); then - IMGOPTS=$(_optstr_add "$IMGOPTS" "compat=1.1") -fi -if [ "$IMGFMT" == "luks" ] && ! (echo "$IMGOPTS" | grep "iter-time=" > /dev/null); then - IMGOPTS=$(_optstr_add "$IMGOPTS" "iter-time=10") -fi -if [ "$IMGFMT" == "vmdk" ] && ! (echo "$IMGOPTS" | grep "zeroed_grain=" > /dev/null); then - IMGOPTS=$(_optstr_add "$IMGOPTS" "zeroed_grain=on") -fi - -if [ -z "$SAMPLE_IMG_DIR" ]; then - SAMPLE_IMG_DIR="$source_iotests/sample_images" -fi - -export TEST_DIR -export SOCK_DIR -export SAMPLE_IMG_DIR - -if [ -s $tmp.list ] -then - # found some valid test numbers ... this is good - : -else - if $have_test_arg - then - # had test numbers, but none in group file ... do nothing - touch $tmp.list - else - # no test numbers, do everything from group file - sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list - fi -fi - -# should be sort -n, but this did not work for Linux when this -# was ported from IRIX -# -list=$(sort $tmp.list) -rm -f $tmp.list $tmp.tmp $tmp.sed - -if [ -z "$QEMU_PROG" ] -then - if [ -x "$build_iotests/qemu" ]; then - export QEMU_PROG="$build_iotests/qemu" - elif [ -x "$build_root/qemu-system-${qemu_arch}" ]; then - export QEMU_PROG="$build_root/qemu-system-${qemu_arch}" - else - pushd "$build_root" > /dev/null - for binary in qemu-system-* - do - if [ -x "$binary" ] - then - export QEMU_PROG="$build_root/$binary" - break - fi - done - popd > /dev/null - [ "$QEMU_PROG" = "" ] && _init_error "qemu not found" - fi -fi -export QEMU_PROG="$(type -p "$QEMU_PROG")" - -export QEMU_OPTIONS="-nodefaults -display none -accel qtest" -case "$QEMU_PROG" in - *qemu-system-arm|*qemu-system-aarch64) - export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt" - ;; - *qemu-system-avr) - export QEMU_OPTIONS="$QEMU_OPTIONS -machine mega2560" - ;; - *qemu-system-rx) - export QEMU_OPTIONS="$QEMU_OPTIONS -machine gdbsim-r5f562n8" - ;; - *qemu-system-tricore) - export QEMU_OPTIONS="-$QEMU_OPTIONS -machine tricore_testboard" - ;; -esac - -if [ -z "$QEMU_IMG_PROG" ]; then - if [ -x "$build_iotests/qemu-img" ]; then - export QEMU_IMG_PROG="$build_iotests/qemu-img" - elif [ -x "$build_root/qemu-img" ]; then - export QEMU_IMG_PROG="$build_root/qemu-img" - else - _init_error "qemu-img not found" - fi -fi -export QEMU_IMG_PROG="$(type -p "$QEMU_IMG_PROG")" - -if [ -z "$QEMU_IO_PROG" ]; then - if [ -x "$build_iotests/qemu-io" ]; then - export QEMU_IO_PROG="$build_iotests/qemu-io" - elif [ -x "$build_root/qemu-io" ]; then - export QEMU_IO_PROG="$build_root/qemu-io" - else - _init_error "qemu-io not found" - fi -fi -export QEMU_IO_PROG="$(type -p "$QEMU_IO_PROG")" - -if [ -z $QEMU_NBD_PROG ]; then - if [ -x "$build_iotests/qemu-nbd" ]; then - export QEMU_NBD_PROG="$build_iotests/qemu-nbd" - elif [ -x "$build_root/qemu-nbd" ]; then - export QEMU_NBD_PROG="$build_root/qemu-nbd" - else - _init_error "qemu-nbd not found" - fi -fi -export QEMU_NBD_PROG="$(type -p "$QEMU_NBD_PROG")" - -if [ -z "$QSD_PROG" ]; then - if [ -x "$build_iotests/qemu-storage-daemon" ]; then - export QSD_PROG="$build_iotests/qemu-storage-daemon" - elif [ -x "$build_root/storage-daemon/qemu-storage-daemon" ]; then - export QSD_PROG="$build_root/storage-daemon/qemu-storage-daemon" - else - _init_error "qemu-storage-daemon not found" - fi -fi -export QSD_PROG="$(type -p "$QSD_PROG")" - -if [ -x "$build_iotests/socket_scm_helper" ] -then - export SOCKET_SCM_HELPER="$build_iotests/socket_scm_helper" -fi - -python_usable=false -if $PYTHON -c 'import sys; sys.exit(0 if sys.version_info >= (3,6) else 1)' -then - # Our python framework also requires virtio-blk - if "$QEMU_PROG" -M none -device help | grep -q virtio-blk >/dev/null 2>&1 - then - python_usable=true - else - python_unusable_because="Missing virtio-blk in QEMU binary" - fi -else - python_unusable_because="Unsupported Python version" -fi - -default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p') -default_alias_machine=$($QEMU_PROG -machine help | \ - sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }") -if [[ "$default_alias_machine" ]]; then - default_machine="$default_alias_machine" -fi - -export QEMU_DEFAULT_MACHINE="$default_machine" - -TIMESTAMP_FILE=check.time-$IMGPROTO-$IMGFMT - -_wallclock() -{ - date "+%H %M %S" | awk '{ print $1*3600 + $2*60 + $3 }' -} - -_wrapup() -{ - if $showme - then - : - elif $needwrap - then - if [ -f $TIMESTAMP_FILE -a -f $tmp.time ] - then - cat $TIMESTAMP_FILE $tmp.time \ - | awk ' - { t[$1] = $2 } -END { if (NR > 0) { - for (i in t) print i " " t[i] - } - }' \ - | sort -n >$tmp.out - mv $tmp.out $TIMESTAMP_FILE - fi - - if [ -f $tmp.expunged ] - then - notrun=$(wc -l <$tmp.expunged | sed -e 's/ *//g') - try=$(expr $try - $notrun) - list=$(echo "$list" | sed -f $tmp.expunged) - fi - - echo "" >>check.log - date >>check.log - echo $list | fmt | sed -e 's/^/ /' >>check.log - $interrupt && echo "Interrupted!" >>check.log - - if [ ! -z "$notrun" ] - then - echo "Not run:$notrun" - echo "Not run:$notrun" >>check.log - fi - if [ ! -z "$casenotrun" ] - then - echo "Some cases not run in:$casenotrun" - echo "Some cases not run in:$casenotrun" >>check.log - fi - if [ ! -z "$n_bad" -a $n_bad != 0 ] - then - echo "Failures:$bad" - echo "Failed $n_bad of $try iotests" - echo "Failures:$bad" | fmt >>check.log - echo "Failed $n_bad of $try iotests" >>check.log - else - echo "Passed all $try iotests" - echo "Passed all $try iotests" >>check.log - fi - needwrap=false - fi - - if test -n "$STTY_RESTORE"; then - stty $STTY_RESTORE - fi - rm -f "${TEST_DIR}"/*.out "${TEST_DIR}"/*.err "${TEST_DIR}"/*.time - rm -f "${TEST_DIR}"/check.pid "${TEST_DIR}"/check.sts - rm -f $tmp.* - - if $tmp_sock_dir - then - rm -rf "$SOCK_DIR" - fi -} - -trap "_wrapup; exit \$status" 0 1 2 3 15 - -# Report the test start and results. For makecheck we want to pretty -# print the whole report at the end of the execution. -# args: $seq, $starttime, $lasttime -_report_test_start() -{ - if ! $makecheck; then - if [ -n "$3" ]; then - local lasttime=" (last: $3s)" - fi - printf "%-8s %-10s [%s] %4s%-14s\r" "$1" "..." "$2" "..." "$lasttime" - fi -} -# args:$seq $status $starttime $lasttime $thistime $details -_report_test_result() -{ - local status lasttime thistime - if $makecheck; then - if [ -n "$2" ] && [ "$2" != "pass" ]; then - status=" [$2]" - fi - printf " TEST iotest-$IMGFMT: %s%s\n" "$1" "$status" - return - fi - - if [ -n "$4" ]; then - lasttime=" (last: $4s)" - fi - if [ -n "$5" ]; then - thistime=" $5s" - fi - case "$2" in - "pass") status=$(printf "\e[32m%-10s\e[0m" "$2") ;; - "fail") status=$(printf "\e[1m\e[31m%-10s\e[0m" "$2") ;; - "not run") status=$(printf "\e[33m%-10s\e[0m" "$2") ;; - *) status=$(printf "%-10s" "$2") ;; - esac - - printf "%-8s %s [%s] [%s] %4s%-14s %s\n" "$1" "$status" "$3" "$(date '+%T')" "$thistime" "$lasttime" "$6" -} - -[ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE - -FULL_IMGFMT_DETAILS=$(_full_imgfmt_details) -FULL_HOST_DETAILS=$(_full_platform_details) - -if ! $makecheck; then - _full_env_details -fi - -seq="check" - -[ -n "$TESTS_REMAINING_LOG" ] && echo $list > $TESTS_REMAINING_LOG - -for seq in $list -do - err=false # error flag - printdiff=false # show diff to reference output? - status="" # test result summary - results="" # test result details - thistime="" # time the test took - - if [ -n "$TESTS_REMAINING_LOG" ] ; then - sed -e "s/$seq//" -e 's/ / /' -e 's/^ *//' $TESTS_REMAINING_LOG > $TESTS_REMAINING_LOG.tmp - mv $TESTS_REMAINING_LOG.tmp $TESTS_REMAINING_LOG - sync - fi - - lasttime=$(sed -n -e "/^$seq /s/.* //p" <$TIMESTAMP_FILE) - starttime=$(date "+%T") - _report_test_start $seq $starttime $lasttime - - if $showme - then - status="not run" - elif [ -f expunged ] && $expunge && egrep "^$seq([ ]|\$)" expunged >/dev/null - then - status="not run" - results="expunged" - rm -f $seq.out.bad - echo "/^$seq\$/d" >>$tmp.expunged - elif [ ! -f "$source_iotests/$seq" ] - then - status="not run" - results="no such test?" - echo "/^$seq\$/d" >>$tmp.expunged - else - # really going to try and run this one - # - rm -f $seq.out.bad - rm -f core $seq.notrun - rm -f $seq.casenotrun - - start=$(_wallclock) - - if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python3" ]; then - if $python_usable; then - run_command="$PYTHON $seq" - else - run_command="false" - echo "$python_unusable_because" > $seq.notrun - fi - else - run_command="./$seq" - fi - export OUTPUT_DIR=$PWD - if $debug; then - (cd "$source_iotests"; - MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ - $run_command -d 2>&1 | tee $tmp.out) - else - (cd "$source_iotests"; - MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ - $run_command >$tmp.out 2>&1) - fi - sts=$? - stop=$(_wallclock) - - if [ -f core ] - then - mv core $seq.core - status="fail" - results="[dumped core] $seq.core" - err=true - fi - - if [ -f $seq.notrun ] - then - # overwrites timestamp output - status="not run" - results="$(cat $seq.notrun)" - else - if [ $sts -ne 0 ] - then - status="fail" - results=$(printf %s "[failed, exit status $sts]") - err=true - fi - - reference="$source_iotests/$seq.out" - reference_machine="$source_iotests/$seq.$QEMU_DEFAULT_MACHINE.out" - if [ -f "$reference_machine" ]; then - reference="$reference_machine" - fi - - reference_format="$source_iotests/$seq.out.$IMGFMT" - if [ -f "$reference_format" ]; then - reference="$reference_format" - fi - - if [ "$CACHEMODE" = "none" ]; then - [ -f "$source_iotests/$seq.out.nocache" ] && reference="$source_iotests/$seq.out.nocache" - fi - - if [ ! -f "$reference" ] - then - status="fail" - results="no qualified output" - err=true - else - if diff -w "$reference" $tmp.out >/dev/null 2>&1 - then - if ! $err; then - status="pass" - thistime=$(expr $stop - $start) - echo "$seq $thistime" >>$tmp.time - fi - else - mv $tmp.out $seq.out.bad - status="fail" - results="output mismatch (see $seq.out.bad)" - printdiff=true - err=true - fi - fi - fi - if [ -f $seq.casenotrun ] - then - cat $seq.casenotrun - casenotrun="$casenotrun $seq" - fi - fi - - # come here for each test, except when $showme is true - # - _report_test_result $seq "$status" "$starttime" "$lasttime" "$thistime" "$results" - case "$status" in - "pass") - try=$(expr $try + 1) - ;; - "fail") - try=$(expr $try + 1) - if $makecheck; then - _full_env_details - fi - if $printdiff; then - $diff -w "$reference" "$PWD"/$seq.out.bad - fi - bad="$bad $seq" - n_bad=$(expr $n_bad + 1) - quick=false - ;; - "not run") - notrun="$notrun $seq" - ;; - esac - - seq="after_$seq" -done -interrupt=false -status=$(expr $n_bad) -exit +import sys +import os +from findtests import find_tests, TestFinder +from testenv import TestEnv +from testrunner import TestRunner + +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: + print('Usage: ./check [options] [testlist]') + print() + TestFinder.get_argparser().print_help() + print() + TestEnv.get_argparser().print_help() + print() + TestRunner.get_argparser().print_help() + exit() + + env = TestEnv(sys.argv[1:]) + tests, remaining_argv = find_tests(env.remaining_argv, + test_dir=env.source_iotests) + + with TestRunner(remaining_argv, env) as tr: + assert not tr.remaining_argv + tr.run_tests([os.path.join(env.source_iotests, t) for t in tests])
tests/qemu-iotests/group deleted +0 -321
321 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH v6 10/11] iotests: rewrite check into python
Am 09.01.2021 um 13:26 hat Vladimir Sementsov-Ogievskiy geschrieben:
Quoted 18 lines
Just use classes introduced in previous three commits. Behavior difference is described in these three commits.
Drop group file, as it becomes unused.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/check | 994 ++------------------------------------- tests/qemu-iotests/group | 321 ------------- 2 files changed, 28 insertions(+), 1287 deletions(-) delete mode 100644 tests/qemu-iotests/grouptests/qemu-iotests/check +6
-0+import sys +import os +from findtests import find_tests, TestFinder +from testenv import TestEnv +from testrunner import TestRunner +
tests/qemu-iotests/check line 34
Quoted 10 lines
tests/qemu-iotests/check +10
-0+if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: + print('Usage: ./check [options] [testlist]') + print() + TestFinder.get_argparser().print_help() + print() + TestEnv.get_argparser().print_help() + print() + TestRunner.get_argparser().print_help() + exit()
+check:34:8: R1722: Consider using sys.exit() (consider-using-sys-exit)
tests/qemu-iotests/check line 42
Quoted 8 lines
tests/qemu-iotests/check +8
-0+ + env = TestEnv(sys.argv[1:]) + tests, remaining_argv = find_tests(env.remaining_argv, + test_dir=env.source_iotests) + + with TestRunner(remaining_argv, env) as tr: + assert not tr.remaining_argv + tr.run_tests([os.path.join(env.source_iotests, t) for t in tests])
The assertion means that giving an unknown option results in an error message like this:
$ build/check -T -raw
Traceback (most recent call last):
File "/home/kwolf/source/qemu/tests/qemu-iotests/build/check", line 41, in <module>
assert not tr.remaining_argv
AssertionErrorI think this could be a bit friendlier (especially since this doesn't even tell you which of your options was wrong).
Kevin
Re: [PATCH v6 10/11] iotests: rewrite check into python
In reply to Vladimir Sementsov-OgievskiyQuoted 11 lines · Vladimir Sementsov-Ogievskiy
Just use classes introduced in previous three commits. Behavior difference is described in these three commits.
Drop group file, as it becomes unused.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/check | 994 ++------------------------------------- tests/qemu-iotests/group | 321 ------------- 2 files changed, 28 insertions(+), 1287 deletions(-) delete mode 100644 tests/qemu-iotests/group
The bulk of the work was done in the earlier patches, and my python review is weak; but I can confirm that with this patch applied, my usual attempts at running ./check still appeared to work for me. That's not the same as proving you did 1:1 feature translation (and in fact, your commit message documented dropping some features like -v), but if 'make check' and CI tools still run, I'm okay leaving it up to developers to complain about any other feature that they used but which go missing (or to implement it).
Quoted 6 lines
tests/qemu-iotests/check +0
-0
tests/qemu-iotests/check line 5
Quoted 8 lines
tests/qemu-iotests/check +4
-3@@ -1,7 +1,8 @@ -#!/usr/bin/env bash +#!/usr/bin/env python3 # -# Copyright (C) 2009 Red Hat, Inc. -# Copyright (c) 2000-2002,2006 Silicon Graphics, Inc. All Rights Reserved. +# Configure environment and run group of tests in it. +# +# Copyright (c) 2020 Virtuozzo International GmbH
You may want to claim 2021 as well.
Quoted 14 lines
tests/qemu-iotests/check +14
-0+import sys +import os +from findtests import find_tests, TestFinder +from testenv import TestEnv +from testrunner import TestRunner + +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: + print('Usage: ./check [options] [testlist]') + print() + TestFinder.get_argparser().print_help() + print() + TestEnv.get_argparser().print_help() + print()
tests/qemu-iotests/check line 42
Quoted 10 lines
tests/qemu-iotests/check +10
-0+ TestRunner.get_argparser().print_help() + exit() + + env = TestEnv(sys.argv[1:]) + tests, remaining_argv = find_tests(env.remaining_argv, + test_dir=env.source_iotests) + + with TestRunner(remaining_argv, env) as tr: + assert not tr.remaining_argv + tr.run_tests([os.path.join(env.source_iotests, t) for t in tests])
A lot shorter for the main engine ;)
tests/qemu-iotests/group line 3
Quoted 9 lines
tests/qemu-iotests/group deleted +0
-3@@ -1,321 +0,0 @@ -# -# QA groups control file -# Defines test groups
Happy to see this conflict magnet go!
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH v6 10/11] iotests: rewrite check into python
Quoted 22 lines · Eric Blake
Quoted 11 lines · Vladimir Sementsov-Ogievskiy
Just use classes introduced in previous three commits. Behavior difference is described in these three commits.
Drop group file, as it becomes unused.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/check | 994 ++------------------------------------- tests/qemu-iotests/group | 321 ------------- 2 files changed, 28 insertions(+), 1287 deletions(-)delete mode 100644 tests/qemu-iotests/group
The bulk of the work was done in the earlier patches, and my python review is weak; but I can confirm that with this patch applied, my usual attempts at running ./check still appeared to work for me. That's not the same as proving you did 1:1 feature translation (and in fact, your commit message documented dropping some features like -v), but if 'make check' and CI tools still run, I'm okay leaving it up to developers to complain about any other feature that they used but which go missing (or to implement it).
Quoted 2 lines
Tested-by Eric Blake <[email protected]>
I will *try* to give this a look, but I am still buried under post-PTO mail; and I feel comfortable with Kevin's Python review otherwise, so don't hold your breath waiting to hear from me.
Quoted 44 lines
Quoted 6 lines
tests/qemu-iotests/check +0
-0tests/qemu-iotests/check line 5
Quoted 8 lines
tests/qemu-iotests/check +4
-3@@ -1,7 +1,8 @@ -#!/usr/bin/env bash +#!/usr/bin/env python3 # -# Copyright (C) 2009 Red Hat, Inc. -# Copyright (c) 2000-2002,2006 Silicon Graphics, Inc. All Rights Reserved. +# Configure environment and run group of tests in it. +# +# Copyright (c) 2020 Virtuozzo International GmbHYou may want to claim 2021 as well.
Quoted 14 lines
tests/qemu-iotests/check +14
-0+import sys +import os +from findtests import find_tests, TestFinder +from testenv import TestEnv +from testrunner import TestRunner + +if __name__ == '__main__': + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: + print('Usage: ./check [options] [testlist]') + print() + TestFinder.get_argparser().print_help() + print() + TestEnv.get_argparser().print_help() + print()tests/qemu-iotests/check line 42
Quoted 10 lines
tests/qemu-iotests/check +10
-0+ TestRunner.get_argparser().print_help() + exit() + + env = TestEnv(sys.argv[1:]) + tests, remaining_argv = find_tests(env.remaining_argv, + test_dir=env.source_iotests) + + with TestRunner(remaining_argv, env) as tr: + assert not tr.remaining_argv + tr.run_tests([os.path.join(env.source_iotests, t) for t in tests])A lot shorter for the main engine ;)
Quoted 12 lines
tests/qemu-iotests/group line 3
Quoted 9 lines
tests/qemu-iotests/group deleted +0
-3@@ -1,321 +0,0 @@ -# -# QA groups control file -# Defines test groupsHappy to see this conflict magnet go!
This rules.
--js
PATCH v6 11/11 iotests: rename and move 169 and 199 tests
In reply to Vladimir Sementsov-OgievskiyRename bitmaps migration tests and move them to tests subdirectory to demonstrate new human-friendly test naming.
---
This patch is and RFC and may be postponed. Or may be applied as well..
tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test} | 0
.../{199.out => tests/migrate-bitmaps-postcopy-test.out} | 0
tests/qemu-iotests/{169 => tests/migrate-bitmaps-test} | 0
tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename tests/qemu-iotests/{199 => tests/migrate-bitmaps-postcopy-test} (100%)
rename tests/qemu-iotests/{199.out => tests/migrate-bitmaps-postcopy-test.out} (100%)
rename tests/qemu-iotests/{169 => tests/migrate-bitmaps-test} (100%)
rename tests/qemu-iotests/{169.out => tests/migrate-bitmaps-test.out} (100%)tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test renamed from tests/qemu-iotests/199 +0 -0
tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test.out renamed from tests/qemu-iotests/199.out +0 -0
tests/qemu-iotests/tests/migrate-bitmaps-test renamed from tests/qemu-iotests/169 +0 -0
tests/qemu-iotests/tests/migrate-bitmaps-test.out renamed from tests/qemu-iotests/169.out +0 -0
Signature · 1 line
2.29.2