From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRwZa-00072z-2T for qemu-devel@nongnu.org; Thu, 11 Sep 2014 01:05:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRwZT-0003qi-H3 for qemu-devel@nongnu.org; Thu, 11 Sep 2014 01:05:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRwZT-0003qc-8H for qemu-devel@nongnu.org; Thu, 11 Sep 2014 01:05:27 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8B55QWp015280 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 11 Sep 2014 01:05:26 -0400 From: Fam Zheng Date: Thu, 11 Sep 2014 13:05:02 +0800 Message-Id: <1410411902-7104-4-git-send-email-famz@redhat.com> In-Reply-To: <1410411902-7104-1-git-send-email-famz@redhat.com> References: <1410411902-7104-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] qemu-iotests: Test blockdev-backup in 055 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Markus Armbruster , Stefan Hajnoczi , pbonzini@redhat.com This applies cases on drive-backup on blockdev-backup, except cases with target format and mode. Also add a case to check source == target. Signed-off-by: Fam Zheng --- tests/qemu-iotests/055 | 277 ++++++++++++++++++++++++++++++++++++++------- tests/qemu-iotests/055.out | 4 +- 2 files changed, 236 insertions(+), 45 deletions(-) diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055 index 451b67d..ab47d59 100755 --- a/tests/qemu-iotests/055 +++ b/tests/qemu-iotests/055 @@ -1,8 +1,8 @@ #!/usr/bin/env python # -# Tests for drive-backup +# Tests for drive-backup and blockdev-backup # -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013, 2014 Red Hat, Inc. # # Based on 041. # @@ -27,6 +27,7 @@ from iotests import qemu_img, qemu_io test_img = os.path.join(iotests.test_dir, 'test.img') target_img = os.path.join(iotests.test_dir, 'target.img') +blockdev_target_img = os.path.join(iotests.test_dir, 'blockdev-target.img') class TestSingleDrive(iotests.QMPTestCase): image_len = 64 * 1024 * 1024 # MB @@ -38,34 +39,48 @@ class TestSingleDrive(iotests.QMPTestCase): qemu_io('-c', 'write -P0xd5 1M 32k', test_img) qemu_io('-c', 'write -P0xdc 32M 124k', test_img) qemu_io('-c', 'write -P0xdc 67043328 64k', test_img) + qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(TestSingleDrive.image_len)) - self.vm = iotests.VM().add_drive(test_img) + self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img) self.vm.launch() def tearDown(self): self.vm.shutdown() os.remove(test_img) + os.remove(blockdev_target_img) try: os.remove(target_img) except OSError: pass - def test_cancel(self): + def do_test_cancel(self, test_drive_backup): self.assert_no_active_block_jobs() - result = self.vm.qmp('drive-backup', device='drive0', - target=target_img, sync='full') + if test_drive_backup: + result = self.vm.qmp('drive-backup', device='drive0', + target=target_img, sync='full') + else: + result = self.vm.qmp('blockdev-backup', device='drive0', + target='drive1', sync='full') self.assert_qmp(result, 'return', {}) event = self.cancel_and_wait() self.assert_qmp(event, 'data/type', 'backup') - def test_pause(self): + def test_cancel(self): + self.do_test_cancel(True) + self.do_test_cancel(False) + + def do_test_pause(self, test_drive_backup): self.assert_no_active_block_jobs() self.vm.pause_drive('drive0') - result = self.vm.qmp('drive-backup', device='drive0', - target=target_img, sync='full') + if test_drive_backup: + result = self.vm.qmp('drive-backup', device='drive0', + target=target_img, sync='full') + else: + result = self.vm.qmp('blockdev-backup', device='drive0', + target='drive1', sync='full') self.assert_qmp(result, 'return', {}) result = self.vm.qmp('block-job-pause', device='drive0') @@ -86,14 +101,28 @@ class TestSingleDrive(iotests.QMPTestCase): self.wait_until_completed() self.vm.shutdown() - self.assertTrue(iotests.compare_images(test_img, target_img), - 'target image does not match source after backup') + if test_drive_backup: + self.assertTrue(iotests.compare_images(test_img, target_img), + 'target image does not match source after backup') + else: + self.assertTrue(iotests.compare_images(test_img, blockdev_target_img), + 'target image does not match source after backup') + + def test_pause_drive_backup(self): + self.do_test_pause(True) + + def test_pause_blockdev_backup(self): + self.do_test_pause(False) def test_medium_not_found(self): result = self.vm.qmp('drive-backup', device='ide1-cd0', target=target_img, sync='full') self.assert_qmp(result, 'error/class', 'GenericError') + result = self.vm.qmp('blockdev-backup', device='ide1-cd0', + target='drive1', sync='full') + self.assert_qmp(result, 'error/class', 'GenericError') + def test_image_not_found(self): result = self.vm.qmp('drive-backup', device='drive0', target=target_img, sync='full', mode='existing') @@ -110,26 +139,56 @@ class TestSingleDrive(iotests.QMPTestCase): target=target_img, sync='full') self.assert_qmp(result, 'error/class', 'DeviceNotFound') + result = self.vm.qmp('blockdev-backup', device='nonexistent', + target='drive0', sync='full') + self.assert_qmp(result, 'error/class', 'DeviceNotFound') + + result = self.vm.qmp('blockdev-backup', device='drive0', + target='nonexistent', sync='full') + self.assert_qmp(result, 'error/class', 'DeviceNotFound') + + result = self.vm.qmp('blockdev-backup', device='nonexistent', + target='nonexistent', sync='full') + self.assert_qmp(result, 'error/class', 'DeviceNotFound') + + def test_target_is_source(self): + result = self.vm.qmp('blockdev-backup', device='drive0', + target='drive0', sync='full') + self.assert_qmp(result, 'error/class', 'GenericError') + class TestSetSpeed(iotests.QMPTestCase): image_len = 80 * 1024 * 1024 # MB def setUp(self): qemu_img('create', '-f', iotests.imgfmt, test_img, str(TestSetSpeed.image_len)) qemu_io('-c', 'write -P1 0 512', test_img) - self.vm = iotests.VM().add_drive(test_img) + qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(TestSingleDrive.image_len)) + + self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img) self.vm.launch() def tearDown(self): self.vm.shutdown() os.remove(test_img) - os.remove(target_img) + try: + os.remove(blockdev_target_img) + except OSError: + pass + try: + os.remove(target_img) + except OSError: + pass - def test_set_speed(self): + def do_test_set_speed(self, test_drive_backup): self.assert_no_active_block_jobs() self.vm.pause_drive('drive0') - result = self.vm.qmp('drive-backup', device='drive0', - target=target_img, sync='full') + if test_drive_backup: + result = self.vm.qmp('drive-backup', device='drive0', + target=target_img, sync='full') + else: + result = self.vm.qmp('blockdev-backup', device='drive0', + target='drive1', sync='full') self.assert_qmp(result, 'return', {}) # Default speed is 0 @@ -148,10 +207,14 @@ class TestSetSpeed(iotests.QMPTestCase): event = self.cancel_and_wait(resume=True) self.assert_qmp(event, 'data/type', 'backup') - # Check setting speed in drive-backup works + # Check setting speed option works self.vm.pause_drive('drive0') - result = self.vm.qmp('drive-backup', device='drive0', - target=target_img, sync='full', speed=4*1024*1024) + if test_drive_backup: + result = self.vm.qmp('drive-backup', device='drive0', + target=target_img, sync='full', speed=4*1024*1024) + else: + result = self.vm.qmp('blockdev-backup', device='drive0', + target='drive1', sync='full', speed=4*1024*1024) self.assert_qmp(result, 'return', {}) result = self.vm.qmp('query-block-jobs') @@ -161,18 +224,32 @@ class TestSetSpeed(iotests.QMPTestCase): event = self.cancel_and_wait(resume=True) self.assert_qmp(event, 'data/type', 'backup') - def test_set_speed_invalid(self): + def test_set_speed_drive_backup(self): + self.do_test_set_speed(True) + + def test_set_speed_blockdev_backup(self): + self.do_test_set_speed(False) + + def do_test_set_speed_invalid(self, test_drive_backup): self.assert_no_active_block_jobs() - result = self.vm.qmp('drive-backup', device='drive0', - target=target_img, sync='full', speed=-1) + if test_drive_backup: + result = self.vm.qmp('drive-backup', device='drive0', + target=target_img, sync='full', speed=-1) + else: + result = self.vm.qmp('blockdev-backup', device='drive0', + target='drive1', sync='full', speed=-1) self.assert_qmp(result, 'error/class', 'GenericError') self.assert_no_active_block_jobs() self.vm.pause_drive('drive0') - result = self.vm.qmp('drive-backup', device='drive0', - target=target_img, sync='full') + if test_drive_backup: + result = self.vm.qmp('drive-backup', device='drive0', + target=target_img, sync='full') + else: + result = self.vm.qmp('blockdev-backup', device='drive0', + target='drive1', sync='full') self.assert_qmp(result, 'return', {}) result = self.vm.qmp('block-job-set-speed', device='drive0', speed=-1) @@ -181,6 +258,12 @@ class TestSetSpeed(iotests.QMPTestCase): event = self.cancel_and_wait(resume=True) self.assert_qmp(event, 'data/type', 'backup') + def test_set_speed_invalid_drive_backup(self): + self.do_test_set_speed_invalid(True) + + def test_set_speed_invalid_blockdev_backup(self): + self.do_test_set_speed_invalid(False) + class TestSingleTransaction(iotests.QMPTestCase): image_len = 64 * 1024 * 1024 # MB @@ -190,44 +273,71 @@ class TestSingleTransaction(iotests.QMPTestCase): qemu_io('-c', 'write -P0xd5 1M 32k', test_img) qemu_io('-c', 'write -P0xdc 32M 124k', test_img) qemu_io('-c', 'write -P0xdc 67043328 64k', test_img) + qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(TestSingleDrive.image_len)) - self.vm = iotests.VM().add_drive(test_img) + self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img) self.vm.launch() def tearDown(self): self.vm.shutdown() os.remove(test_img) + os.remove(blockdev_target_img) try: os.remove(target_img) except OSError: pass - def test_cancel(self): + def do_test_cancel(self, test_drive_backup): self.assert_no_active_block_jobs() - result = self.vm.qmp('transaction', actions=[{ - 'type': 'drive-backup', - 'data': { 'device': 'drive0', - 'target': target_img, - 'sync': 'full' }, - } - ]) + if test_drive_backup: + result = self.vm.qmp('transaction', actions=[{ + 'type': 'drive-backup', + 'data': { 'device': 'drive0', + 'target': target_img, + 'sync': 'full' }, + } + ]) + else: + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'drive0', + 'target': 'drive1', + 'sync': 'full' }, + } + ]) + self.assert_qmp(result, 'return', {}) event = self.cancel_and_wait() self.assert_qmp(event, 'data/type', 'backup') - def test_pause(self): + def test_cancel_drive_backup(self): + self.do_test_cancel(True) + + def test_cancel_blockdev_backup(self): + self.do_test_cancel(False) + + def do_test_pause(self, test_drive_backup): self.assert_no_active_block_jobs() self.vm.pause_drive('drive0') - result = self.vm.qmp('transaction', actions=[{ - 'type': 'drive-backup', - 'data': { 'device': 'drive0', - 'target': target_img, - 'sync': 'full' }, - } - ]) + if test_drive_backup: + result = self.vm.qmp('transaction', actions=[{ + 'type': 'drive-backup', + 'data': { 'device': 'drive0', + 'target': target_img, + 'sync': 'full' }, + } + ]) + else: + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'drive0', + 'target': 'drive1', + 'sync': 'full' }, + } + ]) self.assert_qmp(result, 'return', {}) result = self.vm.qmp('block-job-pause', device='drive0') @@ -248,8 +358,18 @@ class TestSingleTransaction(iotests.QMPTestCase): self.wait_until_completed() self.vm.shutdown() - self.assertTrue(iotests.compare_images(test_img, target_img), - 'target image does not match source after backup') + if test_drive_backup: + self.assertTrue(iotests.compare_images(test_img, target_img), + 'target image does not match source after backup') + else: + self.assertTrue(iotests.compare_images(test_img, blockdev_target_img), + 'target image does not match source after backup') + + def test_pause_drive_backup(self): + self.do_test_pause(True) + + def test_pause_blockdev_backup(self): + self.do_test_pause(False) def test_medium_not_found(self): result = self.vm.qmp('transaction', actions=[{ @@ -260,6 +380,14 @@ class TestSingleTransaction(iotests.QMPTestCase): } ]) self.assert_qmp(result, 'error/class', 'GenericError') + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'ide1-cd0', + 'target': 'drive1', + 'sync': 'full' }, + } + ]) + self.assert_qmp(result, 'error/class', 'GenericError') def test_image_not_found(self): result = self.vm.qmp('transaction', actions=[{ @@ -283,6 +411,43 @@ class TestSingleTransaction(iotests.QMPTestCase): ]) self.assert_qmp(result, 'error/class', 'DeviceNotFound') + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'nonexistent', + 'target': 'drive1', + 'sync': 'full' }, + } + ]) + self.assert_qmp(result, 'error/class', 'DeviceNotFound') + + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'drive0', + 'target': 'nonexistent', + 'sync': 'full' }, + } + ]) + self.assert_qmp(result, 'error/class', 'DeviceNotFound') + + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'nonexistent', + 'target': 'nonexistent', + 'sync': 'full' }, + } + ]) + self.assert_qmp(result, 'error/class', 'DeviceNotFound') + + def test_target_is_source(self): + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'drive0', + 'target': 'drive0', + 'sync': 'full' }, + } + ]) + self.assert_qmp(result, 'error/class', 'GenericError') + def test_abort(self): result = self.vm.qmp('transaction', actions=[{ 'type': 'drive-backup', @@ -298,5 +463,31 @@ class TestSingleTransaction(iotests.QMPTestCase): self.assert_qmp(result, 'error/class', 'GenericError') self.assert_no_active_block_jobs() + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'nonexistent', + 'target': 'drive1', + 'sync': 'full' }, + }, { + 'type': 'Abort', + 'data': {}, + } + ]) + self.assert_qmp(result, 'error/class', 'GenericError') + self.assert_no_active_block_jobs() + + result = self.vm.qmp('transaction', actions=[{ + 'type': 'blockdev-backup', + 'data': { 'device': 'drive0', + 'target': 'nonexistent', + 'sync': 'full' }, + }, { + 'type': 'Abort', + 'data': {}, + } + ]) + self.assert_qmp(result, 'error/class', 'GenericError') + self.assert_no_active_block_jobs() + if __name__ == '__main__': iotests.main(supported_fmts=['raw', 'qcow2']) diff --git a/tests/qemu-iotests/055.out b/tests/qemu-iotests/055.out index 6323079..c6a10f8 100644 --- a/tests/qemu-iotests/055.out +++ b/tests/qemu-iotests/055.out @@ -1,5 +1,5 @@ -.............. +..................... ---------------------------------------------------------------------- -Ran 14 tests +Ran 21 tests OK -- 1.9.3