diff options
| author | John Snow <jsnow@redhat.com> | 2021-09-23 14:07:15 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2021-10-06 10:25:55 +0200 |
| commit | 3765315d4c84f9c0799744f43a314169baaccc05 (patch) | |
| tree | c0e5fe98c0bddcf2e9efeb0e62d14d9dd59481a6 /tests/qemu-iotests | |
| parent | 22968996946d1a4eaca7396099ba40867bb58642 (diff) | |
| download | qemu-3765315d4c84f9c0799744f43a314169baaccc05.zip qemu-3765315d4c84f9c0799744f43a314169baaccc05.tar.gz qemu-3765315d4c84f9c0799744f43a314169baaccc05.tar.bz2 | |
iotests: Update for pylint 2.11.1
1. Ignore the new f-strings warning, we're not interested in doing a
full conversion at this time.
2. Just mute the unbalanced-tuple-unpacking warning, it's not a real
error in this case and muting the dozens of callsites is just not
worth it.
3. Add encodings to read_text().
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210923180715.4168522-7-jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rw-r--r-- | tests/qemu-iotests/pylintrc | 6 | ||||
| -rw-r--r-- | tests/qemu-iotests/testrunner.py | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tests/qemu-iotests/pylintrc b/tests/qemu-iotests/pylintrc index f2c0b52..8cb4e1d 100644 --- a/tests/qemu-iotests/pylintrc +++ b/tests/qemu-iotests/pylintrc @@ -19,13 +19,17 @@ disable=invalid-name, too-many-public-methods, # pylint warns about Optional[] etc. as unsubscriptable in 3.9 unsubscriptable-object, + # pylint's static analysis causes false positivies for file_path(); + # If we really care to make it statically knowable, we'll use mypy. + unbalanced-tuple-unpacking, # Sometimes we need to disable a newly introduced pylint warning. # Doing so should not produce a warning in older versions of pylint. bad-option-value, # These are temporary, and should be removed: missing-docstring, too-many-return-statements, - too-many-statements + too-many-statements, + consider-using-f-string, [FORMAT] diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.py index 4a6ec42..a56b6da 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -266,12 +266,13 @@ class TestRunner(ContextManager['TestRunner']): diff=file_diff(str(f_reference), str(f_bad))) if f_notrun.exists(): - return TestResult(status='not run', - description=f_notrun.read_text().strip()) + return TestResult( + status='not run', + description=f_notrun.read_text(encoding='utf-8').strip()) casenotrun = '' if f_casenotrun.exists(): - casenotrun = f_casenotrun.read_text() + casenotrun = f_casenotrun.read_text(encoding='utf-8') diff = file_diff(str(f_reference), str(f_bad)) if diff: |