[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/10] iotests: Let 045 be run concurrently
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 09/10] iotests: Let 045 be run concurrently |
Date: |
Wed, 30 Jan 2019 16:24:33 +0100 |
Adding a telnet monitor for no real purpose on a fixed port is not so
great. Just use a null monitor instead.
Signed-off-by: Max Reitz <address@hidden>
---
scripts/qemu.py | 5 ++---
tests/qemu-iotests/045 | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 0a5e02eb56..e642a55816 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -136,10 +136,9 @@ class QEMUMachine(object):
return False
# This can be used to add an unused monitor instance.
- def add_monitor_telnet(self, ip, port):
- args = 'tcp:%s:%d,server,nowait,telnet' % (ip, port)
+ def add_monitor_null(self):
self._args.append('-monitor')
- self._args.append(args)
+ self._args.append('null')
def add_fd(self, fd, fdset, opaque, opts=''):
"""
diff --git a/tests/qemu-iotests/045 b/tests/qemu-iotests/045
index 55a5d31ca8..d5484a0ee1 100755
--- a/tests/qemu-iotests/045
+++ b/tests/qemu-iotests/045
@@ -132,7 +132,7 @@ class TestSCMFd(iotests.QMPTestCase):
qemu_img('create', '-f', iotests.imgfmt, image0, '128K')
# Add an unused monitor, to verify it works fine when two monitor
# instances present
- self.vm.add_monitor_telnet("0",4445)
+ self.vm.add_monitor_null()
self.vm.launch()
def tearDown(self):
--
2.20.1
- [Qemu-devel] [PATCH v2 01/10] iotests: Re-add filename filters, (continued)
- [Qemu-devel] [PATCH v2 01/10] iotests: Re-add filename filters, Max Reitz, 2019/01/30
- [Qemu-devel] [PATCH v2 02/10] iotests: Fix 237 for Python 2.x, Max Reitz, 2019/01/30
- [Qemu-devel] [PATCH v2 03/10] iotests: Remove superfluous rm from 232, Max Reitz, 2019/01/30
- [Qemu-devel] [PATCH v2 04/10] iotests: Fix 232 for LUKS, Max Reitz, 2019/01/30
- [Qemu-devel] [PATCH v2 05/10] iotests: Fix 207 to use QMP filters for qmp_log, Max Reitz, 2019/01/30
- [Qemu-devel] [PATCH v2 06/10] iotests.py: Add is_str(), Max Reitz, 2019/01/30
- [Qemu-devel] [PATCH v2 07/10] iotests.py: Filter filename in any string value, Max Reitz, 2019/01/30
- [Qemu-devel] [PATCH v2 08/10] iotests: Filter SSH paths, Max Reitz, 2019/01/30
- [Qemu-devel] [PATCH v2 09/10] iotests: Let 045 be run concurrently,
Max Reitz <=
- [Qemu-devel] [PATCH v2 10/10] iotests.py: s/_/-/g on keys in qmp_log(), Max Reitz, 2019/01/30