This series uses python logging to enable output conditionally on iotests.log(). We unify an initialization call (which also enables debugging output for those tests with -d) and then make the switch inside of iotests.
It will help alleviate the need to create logged/unlogged versions of all the various helpers we have made. Also, I got lost and accidentally delinted iotests while I was here. Sorry about that. V8: 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/11:[----] [--] 'iotests: do a light delinting' 002/11:[----] [--] 'iotests: don't use 'format' for drive_add' 003/11:[----] [--] 'iotests: ignore import warnings from pylint' 004/11:[----] [--] 'iotests: replace mutable list default args' 005/11:[----] [--] 'iotests: add pylintrc file' 006/11:[down] 'iotests: drop Python 3.4 compatibility code' 007/11:[0033] [FC] 'iotests: limit line length to 79 chars' 008/11:[----] [--] 'iotests: add script_initialize' 009/11:[----] [--] 'iotest 258: use script_main' 010/11:[----] [--] 'iotests: Mark verify functions as private' 011/11:[0007] [FC] 'iotests: use python logging for iotests.log()' 6: Split out the little drop of Python 3.4 code. (Phil) 7: Change line continuation styles (QEMU Memorial Choir) 11: Rebase changes; remove use_log from more places, adjust test output. V7: - All delinting patches are now entirely front-loaded. - Redid delinting to avoid "correcting" no-else-return statements. - Moved more mutable list corrections into patch 4, to make it standalone. - Moved pylintrc up to patch 5. Disabled no-else-return. - Added patch 6 to require line length checks. (Some python 3.4 compatibility code is removed as a consequence.) - Patch 7 changes slightly as a result of patch 4 changes. - Added some logging explainer into patch 10. (Patch changes slightly because of patch 6.) V6: - It's been so long since V5, let's just look at it anew. - Dropped patch 1, rebased, added more delinting. - I'm not touching the supported_platforms thing. Not interested in rehashing that debate. V5: - Rebased again - Allow Python tests to run on any platform V4: - Rebased on top of kwolf/block at the behest of mreitz V3: - Rebased for 4.1+; now based on main branch. V2: - Added all of the other python tests I missed to use script_initialize - Refactored the common setup as per Ehabkost's suggestion - Added protocol arguments to common initialization, but this isn't strictly required. John Snow (11): iotests: do a light delinting iotests: don't use 'format' for drive_add iotests: ignore import warnings from pylint iotests: replace mutable list default args iotests: add pylintrc file iotests: drop Python 3.4 compatibility code iotests: limit line length to 79 chars iotests: add script_initialize iotest 258: use script_main iotests: Mark verify functions as private iotests: use python logging for iotests.log() tests/qemu-iotests/030 | 4 +- tests/qemu-iotests/055 | 3 +- tests/qemu-iotests/149 | 3 +- tests/qemu-iotests/155 | 2 +- tests/qemu-iotests/194 | 4 +- tests/qemu-iotests/202 | 4 +- tests/qemu-iotests/203 | 4 +- tests/qemu-iotests/206 | 2 +- tests/qemu-iotests/207 | 6 +- tests/qemu-iotests/208 | 2 +- tests/qemu-iotests/209 | 2 +- tests/qemu-iotests/210 | 6 +- tests/qemu-iotests/211 | 6 +- tests/qemu-iotests/212 | 6 +- tests/qemu-iotests/213 | 6 +- tests/qemu-iotests/216 | 4 +- tests/qemu-iotests/218 | 2 +- tests/qemu-iotests/219 | 2 +- tests/qemu-iotests/222 | 7 +- tests/qemu-iotests/224 | 4 +- tests/qemu-iotests/228 | 6 +- tests/qemu-iotests/234 | 4 +- tests/qemu-iotests/235 | 4 +- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/237 | 2 +- tests/qemu-iotests/238 | 2 + tests/qemu-iotests/242 | 2 +- tests/qemu-iotests/245 | 1 + tests/qemu-iotests/245.out | 24 +-- tests/qemu-iotests/246 | 2 +- tests/qemu-iotests/248 | 2 +- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/255 | 2 +- tests/qemu-iotests/256 | 2 +- tests/qemu-iotests/258 | 10 +- tests/qemu-iotests/260 | 4 +- tests/qemu-iotests/262 | 4 +- tests/qemu-iotests/264 | 4 +- tests/qemu-iotests/277 | 2 + tests/qemu-iotests/280 | 8 +- tests/qemu-iotests/283 | 4 +- tests/qemu-iotests/iotests.py | 312 ++++++++++++++++++++-------------- tests/qemu-iotests/pylintrc | 26 +++ 43 files changed, 307 insertions(+), 203 deletions(-) create mode 100644 tests/qemu-iotests/pylintrc -- 2.21.1