From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSRsq-00026P-9w for qemu-devel@nongnu.org; Thu, 10 May 2012 07:50:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSRsl-0006Uk-GQ for qemu-devel@nongnu.org; Thu, 10 May 2012 07:50:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSRsl-0006Ti-87 for qemu-devel@nongnu.org; Thu, 10 May 2012 07:50:07 -0400 From: Kevin Wolf Date: Thu, 10 May 2012 13:49:27 +0200 Message-Id: <1336650574-12835-24-git-send-email-kwolf@redhat.com> In-Reply-To: <1336650574-12835-1-git-send-email-kwolf@redhat.com> References: <1336650574-12835-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 23/30] stream: fix sectors not allocated test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini 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 Signed-off-by: Kevin Wolf --- tests/qemu-iotests/030 | 1 + 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''' -- 1.7.6.5