[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 66/71] iotests: Let 045 be run concurrently
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 66/71] iotests: Let 045 be run concurrently |
Date: |
Mon, 25 Feb 2019 16:20:48 +0100 |
From: Max Reitz <address@hidden>
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>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
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 32b00af5cc..f7269eefbb 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -144,10 +144,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-block] [PULL 56/71] block: BDS options may lack the "driver" option, (continued)
- [Qemu-block] [PULL 56/71] block: BDS options may lack the "driver" option, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 57/71] iotests: Test json:{} filenames of internal BDSs, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 58/71] iotests: Re-add filename filters, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 59/71] iotests: Fix 237 for Python 2.x, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 60/71] iotests: Remove superfluous rm from 232, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 61/71] iotests: Fix 232 for LUKS, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 62/71] iotests: Fix 207 to use QMP filters for qmp_log, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 63/71] iotests.py: Add is_str(), Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 64/71] iotests.py: Filter filename in any string value, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 65/71] iotests: Filter SSH paths, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 66/71] iotests: Let 045 be run concurrently,
Kevin Wolf <=
- [Qemu-block] [PULL 70/71] vmdk: false positive of compat6 with hwversion not set, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 69/71] iotests: add LUKS payload overhead to 178 qemu-img measure test, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 68/71] qcow2: include LUKS payload overhead in qemu-img measure, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 71/71] iotests: Skip 211 on insufficient memory, Kevin Wolf, 2019/02/25
- [Qemu-block] [PULL 67/71] iotests.py: s/_/-/g on keys in qmp_log(), Kevin Wolf, 2019/02/25
- Re: [Qemu-block] [Qemu-devel] [PULL 00/71] Block layer patches, no-reply, 2019/02/27
- Re: [Qemu-block] [PULL 00/71] Block layer patches, Peter Maydell, 2019/02/28