openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

stream: fix sectors not allocated test 

The test on sectors not allocated can fail if the L1/L2 tables are
not on disk yet.  Allow tests to shutdown the VM early.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-05-08 16:51:53 +02:00 committed by Kevin Wolf
parent cc785c349d
commit 863a5d042f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/qemu-iotests/030
View File

@ -78,6 +78,7 @@ class TestSingleDrive(ImageStreamingTestCase):
completed = True completed = True
self.assert_no_active_streams() self.assert_no_active_streams()
self.vm.shutdown()
self.assertFalse('sectors not allocated' in qemu_io('-c', 'map', test_img), self.assertFalse('sectors not allocated' in qemu_io('-c', 'map', test_img),
'image file not fully populated after streaming') 'image file not fully populated after streaming')

10
tests/qemu-iotests/iotests.py
View File

@ -87,10 +87,12 @@ def launch(self):
def shutdown(self): def shutdown(self):
'''Terminate the VM and clean up''' '''Terminate the VM and clean up'''
self._qmp.cmd('quit') if not self._popen is None:
self._popen.wait() self._qmp.cmd('quit')
os.remove(self._monitor_path) self._popen.wait()
os.remove(self._qemu_log_path) os.remove(self._monitor_path)
os.remove(self._qemu_log_path)
self._popen = None
def qmp(self, cmd, **args): def qmp(self, cmd, **args):
'''Invoke a QMP command and return the result dict''' '''Invoke a QMP command and return the result dict'''