From patchwork Mon Dec 27 16:01:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434651 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 oBRKCV9p025997 for ; Mon, 27 Dec 2010 20:16:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754447Ab0L0QCs (ORCPT ); Mon, 27 Dec 2010 11:02:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52496 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754407Ab0L0QCg (ORCPT ); Mon, 27 Dec 2010 11:02:36 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2Zpq025822 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:35 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBRG2Z2b030694; Mon, 27 Dec 2010 11:02:35 -0500 Received: from moof.tlv.redhat.com (dhcp-1-185.tlv.redhat.com [10.35.1.185]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG1rGB017175; Mon, 27 Dec 2010 11:02:34 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 23/28] KVM test: whql.submission: use a different submission name for each submission category Date: Mon, 27 Dec 2010 18:01:50 +0200 Message-Id: <1293465715-16599-23-git-send-email-mgoldish@redhat.com> In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:17:00 +0000 (UTC) diff --git a/client/tests/kvm/tests/whql_submission.py b/client/tests/kvm/tests/whql_submission.py index a0ff87c..e40e369 100644 --- a/client/tests/kvm/tests/whql_submission.py +++ b/client/tests/kvm/tests/whql_submission.py @@ -76,12 +76,12 @@ def run_whql_submission(test, params, env): session.close() # Run the automation program on the server + pool_name = "%s_pool" % client_names[0] + submission_name = "%s_%s" % (client_names[0], + params.get("submission_name")) cmd = "%s %s %s %s %s %s" % (os.path.basename(dsso_test_binary), - server_name, - "%s_pool" % client_names[0], - "%s_submission" % client_names[0], - test_timeout, - " ".join(client_names)) + server_name, pool_name, submission_name, + test_timeout, " ".join(client_names)) server_session.sendline(cmd) # Helper function: wait for a given prompt and raise an exception if an diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 83f5e4d..c765463 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -412,12 +412,14 @@ variants: dd_data_whqlqual = Unclassified Signature variants: - tablet: + submission_name = tablet extra_params += " -usbdevice tablet" test_device = HID-compliant mouse test_timeout = 36000 - device: variants: - keyboard: + submission_name = keyboard # test_device is a regular expression that should match a device's # name as it appears in device manager. The first device that matches # is used. @@ -430,6 +432,7 @@ variants: dd_data_prog = InputKbd dd_data_desc = Input > Keyboard - net: + submission_name = net # Add a support machine and extra NICs vms += " supportvm" nics += " nic2 nic3" @@ -460,6 +463,7 @@ variants: dp_name_serversupportdev = NdistestLanServerSupportDevice0 dp_regex_serversupportdev = RTL8139.*NIC #2$ - hdd: + submission_name = hdd # Run the tests on a non-system drive # (match device names that contain 'QEMU HARDDISK' and do not contain '[C]') test_device = ^(?=.*?\bQEMU HARDDISK\b)((?!\[C\]).)*$