mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests: Update for pylint 2.11.1

Browse Source 
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>
This commit is contained in:
John Snow 2021-09-23 14:07:15 -04:00 committed by Kevin Wolf
parent 2296899694
commit 3765315d4c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemu-iotests/pylintrc
View File

@ -19,13 +19,17 @@ disable=invalid-name,
too-many-public-methods, too-many-public-methods,
# pylint warns about Optional[] etc. as unsubscriptable in 3.9 # pylint warns about Optional[] etc. as unsubscriptable in 3.9
unsubscriptable-object, 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. # Sometimes we need to disable a newly introduced pylint warning.
# Doing so should not produce a warning in older versions of pylint. # Doing so should not produce a warning in older versions of pylint.
bad-option-value, bad-option-value,
# These are temporary, and should be removed: # These are temporary, and should be removed:
missing-docstring, missing-docstring,
too-many-return-statements, too-many-return-statements,
too-many-statements too-many-statements,
consider-using-f-string,
[FORMAT] [FORMAT]

7
tests/qemu-iotests/testrunner.py
View File

@ -266,12 +266,13 @@ class TestRunner(ContextManager['TestRunner']):
diff=file_diff(str(f_reference), str(f_bad))) diff=file_diff(str(f_reference), str(f_bad)))
if f_notrun.exists(): if f_notrun.exists():
return TestResult(status='not run', return TestResult(
description=f_notrun.read_text().strip()) status='not run',
description=f_notrun.read_text(encoding='utf-8').strip())
casenotrun = '' casenotrun = ''
if f_casenotrun.exists(): 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)) diff = file_diff(str(f_reference), str(f_bad))
if diff: if diff: