From patchwork Wed Apr 27 03:19:39 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: 735271 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 p3R3KJRw007098 for ; Wed, 27 Apr 2011 03:20:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754195Ab1D0DUP (ORCPT ); Tue, 26 Apr 2011 23:20:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47706 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754060Ab1D0DUO (ORCPT ); Tue, 26 Apr 2011 23:20:14 -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 p3R3KCQb008326 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Apr 2011 23:20:13 -0400 Received: from freedom.redhat.com (vpn-9-62.rdu.redhat.com [10.11.9.62]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3R3JhId032053; Tue, 26 Apr 2011 23:20:11 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues , Martin Jenner Subject: [PATCH 6/7] KVM test: Try to load subtests from a shared tests location Date: Wed, 27 Apr 2011 00:19:39 -0300 Message-Id: <1303874380-18137-7-git-send-email-lmr@redhat.com> In-Reply-To: <1303874380-18137-1-git-send-email-lmr@redhat.com> References: <1303874380-18137-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]); Wed, 27 Apr 2011 03:20:19 +0000 (UTC) As we have several subtests that can be shared among different virtualization tests (kvm, xen), manipulate kvm.py to try loading subtests from the kvm area (client/tests/kvm/tests) first, then falling back to the specific test area (planned to be client/virt/tests). Changes from v1: * Martin Jenner has suggested inverting the lookup order. Looking first on the specific kvm subtest area *then* common allows people to override the commom implementation of a test that might be better for that particular virt technology. Signed-off-by: Lucas Meneghel Rodrigues Signed-off-by: Martin Jenner --- client/tests/kvm/kvm.py | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/client/tests/kvm/kvm.py b/client/tests/kvm/kvm.py index 2006880..bb17f28 100644 --- a/client/tests/kvm/kvm.py +++ b/client/tests/kvm/kvm.py @@ -59,11 +59,19 @@ class kvm(test.test): # test type t_type = params.get("type") # Verify if we have the correspondent source file for it - subtest_dir = os.path.join(self.bindir, "tests") - module_path = os.path.join(subtest_dir, "%s.py" % t_type) - if not os.path.isfile(module_path): - raise error.TestError("No %s.py test file found" % - t_type) + virt_dir = os.path.dirname(virt_utils.__file__) + subtest_dir_virt = os.path.join(virt_dir, "tests") + subtest_dir_kvm = os.path.join(self.bindir, "tests") + subtest_dir = None + for d in [subtest_dir_kvm, subtest_dir_virt]: + module_path = os.path.join(d, "%s.py" % t_type) + if os.path.isfile(module_path): + subtest_dir = d + break + if subtest_dir is None: + raise error.TestError("Could not find test file %s.py " + "on either %s or %s directory" % + subtest_dir_kvm, subtest_dir_virt) # Load the test module f, p, d = imp.find_module(t_type, [subtest_dir]) test_module = imp.load_module(t_type, f, p, d)