From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ylflt-0006nF-U7 for qemu-devel@nongnu.org; Fri, 24 Apr 2015 11:44:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ylfls-0006QI-9a for qemu-devel@nongnu.org; Fri, 24 Apr 2015 11:44:05 -0400 Message-ID: <553A64B5.4030604@redhat.com> Date: Fri, 24 Apr 2015 17:43:49 +0200 From: Max Reitz MIME-Version: 1.0 References: <1428069921-2957-1-git-send-email-famz@redhat.com> <1428069921-2957-4-git-send-email-famz@redhat.com> In-Reply-To: <1428069921-2957-4-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [Qemu-block] [PATCH v2 3/4] qemu-iotests: Test that "stop" doesn't drain block jobs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Stefan Hajnoczi , qemu-block@nongnu.org On 03.04.2015 16:05, Fam Zheng wrote: > Signed-off-by: Fam Zheng > --- > tests/qemu-iotests/129 | 86 ++++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/129.out | 5 +++ > tests/qemu-iotests/group | 1 + > 3 files changed, 92 insertions(+) > create mode 100644 tests/qemu-iotests/129 > create mode 100644 tests/qemu-iotests/129.out > > diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129 > new file mode 100644 > index 0000000..9e87e1c > --- /dev/null > +++ b/tests/qemu-iotests/129 > @@ -0,0 +1,86 @@ > +#!/usr/bin/env python > +# > +# Tests that "bdrv_drain_all" doesn't drain block jobs > +# > +# Copyright (C) 2015 Red Hat, Inc. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see . > +# > + > +import os > +import iotests > +import time > + > +class TestStopWithBlockJob(iotests.QMPTestCase): > + test_img = os.path.join(iotests.test_dir, 'test.img') > + target_img = os.path.join(iotests.test_dir, 'target.img') > + base_img = os.path.join(iotests.test_dir, 'base.img') > + > + def setUp(self): > + iotests.qemu_img('create', '-f', iotests.imgfmt, self.base_img, "1G") > + iotests.qemu_img('create', '-f', iotests.imgfmt, self.test_img, "-b", self.base_img) > + iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 1M 128M', self.test_img) > + self.vm = iotests.VM().add_drive(self.test_img) > + self.vm.launch() > + > + def tearDown(self): > + params = {"device": "drive0", > + "bps": 0, > + "bps_rd": 0, > + "bps_wr": 0, > + "iops": 0, > + "iops_rd": 0, > + "iops_wr": 0, > + } > + result = self.vm.qmp("block_set_io_throttle", conv_keys=False, > + **params) > + self.vm.shutdown() > + > + def do_test_stop(self, cmd, **args): > + """Test 'stop' while block job is running on a throttled drive. > + The 'stop' command shouldn't drain the job""" > + params = {"device": "drive0", > + "bps": 1024, > + "bps_rd": 0, > + "bps_wr": 0, > + "iops": 0, > + "iops_rd": 0, > + "iops_wr": 0, > + } > + result = self.vm.qmp("block_set_io_throttle", conv_keys=False, > + **params) > + self.assert_qmp(result, 'return', {}) > + result = self.vm.qmp(cmd, **args) > + self.assert_qmp(result, 'return', {}) > + result = self.vm.qmp("stop") > + self.assert_qmp(result, 'return', {}) > + result = self.vm.qmp("query-block-jobs") > + self.assert_qmp(result, 'return[0]/busy', True) I don't know why, but this assertion fails in tmpfs (for me, at least). Max > + self.assert_qmp(result, 'return[0]/ready', False) > + > + def test_drive_mirror(self): > + self.do_test_stop("drive-mirror", device="drive0", > + target=self.target_img, > + sync="full") > + > + def test_drive_backup(self): > + self.do_test_stop("drive-backup", device="drive0", > + target=self.target_img, > + sync="full") > + > + def test_block_commit(self): > + self.do_test_stop("block-commit", device="drive0") > + > +if __name__ == '__main__': > + iotests.main(supported_fmts=["qcow2"]) > diff --git a/tests/qemu-iotests/129.out b/tests/qemu-iotests/129.out > new file mode 100644 > index 0000000..8d7e996 > --- /dev/null > +++ b/tests/qemu-iotests/129.out > @@ -0,0 +1,5 @@ > +... > +---------------------------------------------------------------------- > +Ran 3 tests > + > +OK > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index 6262127..69071ac 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -124,3 +124,4 @@ > 121 rw auto > 123 rw auto quick > 128 rw auto quick > +129 rw auto quick