diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-05-08 16:51:53 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-05-10 10:32:13 +0200 |
| commit | 863a5d042fdee6b1f602794d99a5121a42e4f181 (patch) | |
| tree | e52bdc079ec09c96fef4000b258d06e6ed68c815 /tests | |
| parent | cc785c349de002596a4f4d116e62846fc18d7b9e (diff) | |
| download | qemu-863a5d042fdee6b1f602794d99a5121a42e4f181.zip qemu-863a5d042fdee6b1f602794d99a5121a42e4f181.tar.gz qemu-863a5d042fdee6b1f602794d99a5121a42e4f181.tar.bz2 | |
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>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/030 | 1 | ||||
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 38abc2c..0d2f87b 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -78,6 +78,7 @@ class TestSingleDrive(ImageStreamingTestCase): completed = True self.assert_no_active_streams() + self.vm.shutdown() self.assertFalse('sectors not allocated' in qemu_io('-c', 'map', test_img), 'image file not fully populated after streaming') diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 36787cc..e27b40e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -87,10 +87,12 @@ class VM(object): def shutdown(self): '''Terminate the VM and clean up''' - self._qmp.cmd('quit') - self._popen.wait() - os.remove(self._monitor_path) - os.remove(self._qemu_log_path) + if not self._popen is None: + self._qmp.cmd('quit') + self._popen.wait() + os.remove(self._monitor_path) + os.remove(self._qemu_log_path) + self._popen = None def qmp(self, cmd, **args): '''Invoke a QMP command and return the result dict''' |