aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-06-06 16:23:27 +0200
committerKevin Wolf <kwolf@redhat.com>2012-06-15 14:03:43 +0200
commit0fd05e8dd1ee7ae143fba3d6bcc6abe3fbeaeb34 (patch)
tree9f805351b7c914a7c8b1820dd44834e2a70d388b
parentab68cdfaa94e74eda250b0f9a5ce2969f4eb8066 (diff)
downloadqemu-0fd05e8dd1ee7ae143fba3d6bcc6abe3fbeaeb34.zip
qemu-0fd05e8dd1ee7ae143fba3d6bcc6abe3fbeaeb34.tar.gz
qemu-0fd05e8dd1ee7ae143fba3d6bcc6abe3fbeaeb34.tar.bz2
qemu-iotests: start vms in qtest mode
This way, they will not execute any VM code at all. However, right now the cancellation test is "relying" on being slowed down by TCG executing BIOS code. So, change the timeouts. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rwxr-xr-xtests/qemu-iotests/0302
-rw-r--r--tests/qemu-iotests/iotests.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 4ab7d62..cc671dd 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -147,7 +147,7 @@ class TestStreamStop(ImageStreamingTestCase):
result = self.vm.qmp('block-stream', device='drive0')
self.assert_qmp(result, 'return', {})
- time.sleep(1)
+ time.sleep(0.1)
events = self.vm.get_qmp_events(wait=False)
self.assertEqual(events, [], 'unexpected QMP event: %s' % events)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index e27b40e..e05b1d6 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -54,7 +54,9 @@ class VM(object):
self._qemu_log_path = os.path.join(test_dir, 'qemu-log.%d' % os.getpid())
self._args = qemu_args + ['-chardev',
'socket,id=mon,path=' + self._monitor_path,
- '-mon', 'chardev=mon,mode=control', '-nographic']
+ '-mon', 'chardev=mon,mode=control',
+ '-qtest', 'stdio', '-machine', 'accel=qtest',
+ '-display', 'none', '-vga', 'none']
self._num_drives = 0
def add_drive(self, path, opts=''):