diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-02-10 15:57:35 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2019-02-25 15:11:28 +0100 |
| commit | e35792b6fde67f6d6a302b39c1b4ea2c019fa439 (patch) | |
| tree | 052af907ab960c43d3c727cdfe7189c26c63bcb4 | |
| parent | ac3589dc463c18e6726be2831196c7755bec39d5 (diff) | |
| download | focaccia-qemu-e35792b6fde67f6d6a302b39c1b4ea2c019fa439.tar.gz focaccia-qemu-e35792b6fde67f6d6a302b39c1b4ea2c019fa439.zip | |
iotests: Let 045 be run concurrently
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 <mreitz@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Message-id: 20190210145736.1486-10-mreitz@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | scripts/qemu.py | 5 | ||||
| -rwxr-xr-x | 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): |