| Message ID | 20210824153540.177128-2-hreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | iotests: Fix pylint warnings | expand |
On 8/24/21 5:35 PM, Hanna Reitz wrote: > As of recently, pylint complains when `open()` calls are missing an > `encoding=` specified. Everything we have should be UTF-8 (and in fact, > everything should be UTF-8, period (exceptions apply)), so use that. > > Signed-off-by: Hanna Reitz <hreitz@redhat.com> > --- > tests/qemu-iotests/297 | 2 +- > tests/qemu-iotests/iotests.py | 8 +++++--- > 2 files changed, 6 insertions(+), 4 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On Tue, Aug 24, 2021 at 11:47 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > On 8/24/21 5:35 PM, Hanna Reitz wrote: > > As of recently, pylint complains when `open()` calls are missing an > > `encoding=` specified. Everything we have should be UTF-8 (and in fact, > > everything should be UTF-8, period (exceptions apply)), so use that. > > > > Signed-off-by: Hanna Reitz <hreitz@redhat.com> > > --- > > tests/qemu-iotests/297 | 2 +- > > tests/qemu-iotests/iotests.py | 8 +++++--- > > 2 files changed, 6 insertions(+), 4 deletions(-) > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > I don't see this upstream just yet, so ... Reviewed-by: John Snow <jsnow@redhat.com> I'll get around to revisiting my "run the iotest linters on Python CI" thing soon which will flush out anything else that might still be missing. --js
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 index 433b732336..0a49953d27 100755 --- a/tests/qemu-iotests/297 +++ b/tests/qemu-iotests/297 @@ -46,7 +46,7 @@ def is_python_file(filename): if filename.endswith('.py'): return True - with open(filename) as f: + with open(filename, encoding='utf-8') as f: try: first_line = f.readline() return re.match('^#!.*python', first_line) is not None diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 4c8971d946..c05c16494b 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -610,7 +610,7 @@ def _post_shutdown(self) -> None: return valgrind_filename = f"{test_dir}/{self._popen.pid}.valgrind" if self.exitcode() == 99: - with open(valgrind_filename) as f: + with open(valgrind_filename, encoding='utf-8') as f: print(f.read()) else: os.remove(valgrind_filename) @@ -1120,7 +1120,8 @@ def notrun(reason): # Each test in qemu-iotests has a number ("seq") seq = os.path.basename(sys.argv[0]) - with open('%s/%s.notrun' % (output_dir, seq), 'w') as outfile: + with open('%s/%s.notrun' % (output_dir, seq), 'w', encoding='utf-8') \ + as outfile: outfile.write(reason + '\n') logger.warning("%s not run: %s", seq, reason) sys.exit(0) @@ -1134,7 +1135,8 @@ def case_notrun(reason): # Each test in qemu-iotests has a number ("seq") seq = os.path.basename(sys.argv[0]) - with open('%s/%s.casenotrun' % (output_dir, seq), 'a') as outfile: + with open('%s/%s.casenotrun' % (output_dir, seq), 'a', encoding='utf-8') \ + as outfile: outfile.write(' [case not run] ' + reason + '\n') def _verify_image_format(supported_fmts: Sequence[str] = (),
As of recently, pylint complains when `open()` calls are missing an `encoding=` specified. Everything we have should be UTF-8 (and in fact, everything should be UTF-8, period (exceptions apply)), so use that. Signed-off-by: Hanna Reitz <hreitz@redhat.com> --- tests/qemu-iotests/297 | 2 +- tests/qemu-iotests/iotests.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-)