[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/17] iotests: use subprocess.DEVNULL instead of open("/dev/n
From: |
John Snow |
Subject: |
[PATCH v2 02/17] iotests: use subprocess.DEVNULL instead of open("/dev/null") |
Date: |
Tue, 20 Jul 2021 13:33:21 -0400 |
Avoids a warning from pylint not to use open() outside of a
with-statement, and is ... probably more portable anyway. Not that I
think we care too much about running tests *on* Windows, but... eh.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/iotests.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index beadf5c821c..64f9b688f55 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -219,18 +219,18 @@ def qemu_io_silent(*args):
default_args = qemu_io_args
args = default_args + list(args)
- exitcode = subprocess.call(args, stdout=open('/dev/null', 'w'))
- if exitcode < 0:
+ result = subprocess.run(args, stdout=subprocess.DEVNULL, check=False)
+ if result.returncode < 0:
sys.stderr.write('qemu-io received signal %i: %s\n' %
- (-exitcode, ' '.join(args)))
- return exitcode
+ (-result.returncode, ' '.join(args)))
+ return result.returncode
def qemu_io_silent_check(*args):
'''Run qemu-io and return the true if subprocess returned 0'''
args = qemu_io_args + list(args)
- exitcode = subprocess.call(args, stdout=open('/dev/null', 'w'),
- stderr=subprocess.STDOUT)
- return exitcode == 0
+ result = subprocess.run(args, stdout=subprocess.DEVNULL,
+ stderr=subprocess.STDOUT, check=False)
+ return result.returncode == 0
class QemuIoInteractive:
def __init__(self, *args):
--
2.31.1
- [PATCH v2 00/17] python/iotests: Run iotest linters during Python CI, John Snow, 2021/07/20
- [PATCH v2 01/17] iotests: use with-statement for open() calls, John Snow, 2021/07/20
- [PATCH v2 02/17] iotests: use subprocess.DEVNULL instead of open("/dev/null"),
John Snow <=
- [PATCH v2 03/17] iotests/mirror-top-perms: Adjust import paths, John Snow, 2021/07/20
- [PATCH v2 04/17] iotests/migrate-bitmaps-postcopy-test: declare instance variables, John Snow, 2021/07/20
- [PATCH v2 05/17] iotests/migrate-bitmaps-test: delint, John Snow, 2021/07/20
- [PATCH v2 06/17] iotests/297: modify is_python_file to work from any CWD, John Snow, 2021/07/20
- [PATCH v2 07/17] iotests/297: Add get_files() function, John Snow, 2021/07/20
- [PATCH v2 10/17] iotests/297: Create main() function, John Snow, 2021/07/20
- [PATCH v2 09/17] iotests/297: Don't rely on distro-specific linter binaries, John Snow, 2021/07/20