From patchwork Fri May 20 06:19:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 802232 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4K6J8dB025731 for ; Fri, 20 May 2011 06:19:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933251Ab1ETGTE (ORCPT ); Fri, 20 May 2011 02:19:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48933 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933234Ab1ETGTE (ORCPT ); Fri, 20 May 2011 02:19:04 -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 p4K6J1dD010207 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 May 2011 02:19:02 -0400 Received: from freedom.redhat.com (vpn-9-69.rdu.redhat.com [10.11.9.69]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4K6IxPq019288; Fri, 20 May 2011 02:19:00 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] Make physical_resources_check cope with qemu change on 'info block' Date: Fri, 20 May 2011 03:19:07 -0300 Message-Id: <1305872347-6332-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 20 May 2011 06:19:08 +0000 (UTC) New qemu upstream versions report block info like this: (monitor humanmonitor1) Sending command 'info block' (monitor humanmonitor1) Response to 'info block' (monitor humanmonitor1) virtio0: removable=0 file=/tmp/kvm_autotest_root/images/rhel6-64.qcow2 ro=0 drv=qcow2 encrypted=0 (monitor humanmonitor1) ide1-cd0: removable=1 locked=0 [not inserted] (monitor humanmonitor1) floppy0: removable=1 locked=0 [not inserted] (monitor humanmonitor1) sd0: removable=1 locked=0 [not inserted] (monitor humanmonitor1) Sending command 'info block' (monitor humanmonitor1) Response to 'info block' (monitor humanmonitor1) virtio0: type=hd removable=0 file=/tmp/kvm_autotest_root/images/rhel6-64.qcow2 ro=0 drv=qcow2 encrypted=0 (monitor humanmonitor1) ide1-cd0: type=cdrom removable=1 locked=0 [not inserted] (monitor humanmonitor1) floppy0: type=floppy removable=1 locked=0 [not inserted] (monitor humanmonitor1) sd0: type=floppy removable=1 locked=0 [not inserted] So the types are missing. Adapting the test to take into account those differences. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/tests/physical_resources_check.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/tests/kvm/tests/physical_resources_check.py b/client/tests/kvm/tests/physical_resources_check.py index 53a23d1..9d93c1c 100644 --- a/client/tests/kvm/tests/physical_resources_check.py +++ b/client/tests/kvm/tests/physical_resources_check.py @@ -29,6 +29,9 @@ def run_physical_resources_check(test, params, env): # resources to know which checks passed and which ones failed n_fail = 0 + # We will check HDs with the image name + image_name = virt_vm.get_image_filename(params, test.bindir) + # Check cpu count logging.info("CPU count check") expected_cpu_nr = int(params.get("smp")) @@ -70,7 +73,7 @@ def run_physical_resources_check(test, params, env): return expected_num, f_fail logging.info("Hard drive count check") - n_fail += check_num("images", "block", "type=hd")[1] + n_fail += check_num("images", "block", image_name)[1] logging.info("NIC count check") n_fail += check_num("nics", "network", "model=")[1] @@ -111,7 +114,8 @@ def run_physical_resources_check(test, params, env): n_fail += f_fail logging.info("Drive format check") - f_fail = chk_fmt_model("images", "drive_format", "block", "(.*)\: type=hd") + f_fail = chk_fmt_model("images", "drive_format", + "block", "(.*)\: .*%s" % image_name) n_fail += f_fail logging.info("Network card MAC check")