iotests: Make them work for both Python 2 and 3
Status from this message: Queued on python-next, thanks!
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest9 patches 1 replyApplied
- v29 patches 11 repliesSuperseded
- v19 patches 38 repliesSuperseded
Changes in v3 from the cover letter
- Patch 5: s/list comprehension/a generator expression/ in the commit message [Eduardo]
- Patch 6: s/inherit/bequeath/ in commit title (the Python script bequeathes, it does not inherit)
- Patch 8: s/StringIO()/io.StringIO/ [Eduardo]
Patches in v3 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/9 | iotests: Make nbd-fault-injector flushtests/ tests/ | +10 | 0 replies | |
| 2/9 | iotests: Flush in iotests.py's QemuIoInteractivetests/ | +1 | 0 replies | |
| 3/9 | iotests: Use Python byte strings where appropriatescripts/ tests/ tests/ +4 more | +26 | 0 replies | |
| 4/9 | iotests: Use // for Python integer divisiontests/ tests/ tests/ +8 more | +30 | 0 replies | |
| 5/9 | iotests: Different iterator behavior in Python 3tests/ tests/ tests/ +3 more | +23 | 0 replies | |
| 6/9 | iotests: Explicitly bequeath FDs in Pythonscripts/ tests/ tests/ | +31 | 0 replies | |
| 7/9 | iotests: 'new' module replacement in 169tests/ | +1 | 0 replies | |
| 8/9 | iotests: Modify imports for Python 3tests/ tests/ | +14 | 0 replies | |
| 9/9 | iotests: Unify log outputs between Python 2 and 3tests/ tests/ tests/ +13 more | +744 | 0 replies |
Reviews trailers per patch
All 9 patches have a Reviewed-by or Acked-by.
| Patch | Eduardo Habkost | Cleber Rosa | Eric Blake |
|---|---|---|---|
| 1/9 | R-b | R-b | R-b |
| 2/9 | R-b | R-b | |
| 3/9 | R-b | ||
| 4/9 | R-b | R-b | |
| 5/9 | R-b | R-b | |
| 6/9 | R-b | R-b | |
| 7/9 | R-b | R-b | |
| 8/9 | R-b | R-b | |
| 9/9 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.
Cover letter [Qemu-devel] [PATCH v3 0/9] iotests: Make them work for both Python 2 and 3
This series prepares the iotests to work with both Python 2 and 3. In some places, it adds version-specific code and decides what to do based on the version (for instance, whether to import the StringIO or the BytesIO class from 'io' for use with the test runner), but most of the time, it just makes code work for both versions in general.
And when we make the switch to make Python 3 mandatory, we can simply drop the Python 2 branches.
v3:
- Patch 5: s/list comprehension/a generator expression/ in the commit message [Eduardo]
- Patch 6: s/inherit/bequeath/ in commit title (the Python script bequeathes, it does not inherit)
- Patch 8: s/StringIO()/io.StringIO/ [Eduardo]
git-backport-diff against v2:
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/9:[----] [--] 'iotests: Make nbd-fault-injector flush' 002/9:[----] [--] 'iotests: Flush in iotests.py's QemuIoInteractive' 003/9:[----] [--] 'iotests: Use Python byte strings where appropriate' 004/9:[----] [--] 'iotests: Use // for Python integer division' 005/9:[----] [--] 'iotests: Different iterator behavior in Python 3' 006/9:[down] 'iotests: Explicitly bequeath FDs in Python'
^^^^ Changed commit title, actually [----] [--]
007/9:[----] [--] 'iotests: 'new' module replacement in 169' 008/9:[0002] [FC] 'iotests: Modify imports for Python 3' 009/9:[----] [--] 'iotests: Unify log outputs between Python 2 and 3'
Max Reitz (9):
iotests: Make nbd-fault-injector flush
iotests: Flush in iotests.py's QemuIoInteractive
iotests: Use Python byte strings where appropriate
iotests: Use // for Python integer division
iotests: Different iterator behavior in Python 3
iotests: Explicitly bequeath FDs in Python
iotests: 'new' module replacement in 169
iotests: Modify imports for Python 3
iotests: Unify log outputs between Python 2 and 3
scripts/qemu.py | 34 +- scripts/qtest.py | 2 +- tests/qemu-iotests/030 | 2 +- tests/qemu-iotests/040 | 4 +- tests/qemu-iotests/041 | 4 +- tests/qemu-iotests/044 | 24 +- tests/qemu-iotests/045 | 2 +- tests/qemu-iotests/056 | 2 +- tests/qemu-iotests/065 | 4 +- tests/qemu-iotests/083.out | 9 + tests/qemu-iotests/093 | 18 +- tests/qemu-iotests/124 | 4 +- tests/qemu-iotests/136 | 2 +- tests/qemu-iotests/139 | 2 +- tests/qemu-iotests/147 | 2 +- tests/qemu-iotests/149 | 14 +- tests/qemu-iotests/151 | 12 +- tests/qemu-iotests/163 | 13 +- tests/qemu-iotests/169 | 3 +- tests/qemu-iotests/194.out | 22 +- tests/qemu-iotests/202.out | 12 +- tests/qemu-iotests/203.out | 14 +- tests/qemu-iotests/206.out | 218 +++++----- tests/qemu-iotests/207 | 6 +- tests/qemu-iotests/207.out | 72 ++-- tests/qemu-iotests/208.out | 8 +- tests/qemu-iotests/210.out | 94 ++-- tests/qemu-iotests/211.out | 102 ++--- tests/qemu-iotests/212.out | 174 ++++---- tests/qemu-iotests/213.out | 182 ++++---- tests/qemu-iotests/216.out | 4 +- tests/qemu-iotests/218.out | 20 +- tests/qemu-iotests/219.out | 526 +++++++++++------------ tests/qemu-iotests/222.out | 24 +- tests/qemu-iotests/iotests.py | 37 +- tests/qemu-iotests/nbd-fault-injector.py | 12 +- tests/qemu-iotests/qcow2.py | 10 +- tests/qemu-iotests/qed.py | 6 +- 38 files changed, 879 insertions(+), 821 deletions(-)
Signature · 1 line
2.17.1