From patchwork Fri Mar 29 17:14:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiri Zupka X-Patchwork-Id: 2366221 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D63F6400E6 for ; Fri, 29 Mar 2013 17:14:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756109Ab3C2RO2 (ORCPT ); Fri, 29 Mar 2013 13:14:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38318 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756013Ab3C2RO1 (ORCPT ); Fri, 29 Mar 2013 13:14:27 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2THER2O030690 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 29 Mar 2013 13:14:27 -0400 Received: from jzupka-pc.local.com (vpn1-6-43.ams2.redhat.com [10.36.6.43]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2THEDM2032179; Fri, 29 Mar 2013 13:14:25 -0400 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=BDupka?= To: virt-test-devel@redhat.com, kvm@vger.kernel.org, kvm-autotest@redhat.com, lmr@redhat.com, ldoktor@redhat.com, jzupka@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com Subject: [virt-test][PATCH 5/7] virt: Update Cartesian config unittest named variants Date: Fri, 29 Mar 2013 18:14:08 +0100 Message-Id: <1364577250-2637-6-git-send-email-jzupka@redhat.com> In-Reply-To: <1364577250-2637-1-git-send-email-jzupka@redhat.com> References: <1364577250-2637-1-git-send-email-jzupka@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Ji?í Župka --- virttest/cartesian_config_unittest.py | 79 +++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/virttest/cartesian_config_unittest.py b/virttest/cartesian_config_unittest.py index afc1b14..98c1efc 100755 --- a/virttest/cartesian_config_unittest.py +++ b/virttest/cartesian_config_unittest.py @@ -86,6 +86,85 @@ class CartesianConfigTest(unittest.TestCase): ) + def testNameVariant(self): + self._checkStringDump(""" + variants name=tests: # All tests in configuration + - wait: + run = "wait" + variants: + - long: + time = short_time + - short: long + time = logn_time + - test2: + run = "test1" + + variants name=virt_system: + - @linux: + - windows: + + variants name=host_os: + - linux: + image = linux + - windows: + image = windows + + only host_os>linux + """, + [ + {'dep': [], + 'host_os': 'linux', + 'image': 'linux', + 'name': 'host_os>linux.virt_system>linux.tests>wait.long', + 'run': 'wait', + 'shortname': 'host_os>linux.tests>wait.long', + 'tests': 'wait', + 'time': 'short_time', + 'virt_system': 'linux'}, + {'dep': ['host_os>linux.virt_system>linux.tests>wait.long'], + 'host_os': 'linux', + 'image': 'linux', + 'name': 'host_os>linux.virt_system>linux.tests>wait.short', + 'run': 'wait', + 'shortname': 'host_os>linux.tests>wait.short', + 'tests': 'wait', + 'time': 'logn_time', + 'virt_system': 'linux'}, + {'dep': [], + 'host_os': 'linux', + 'image': 'linux', + 'name': 'host_os>linux.virt_system>linux.tests>test2', + 'run': 'test1', + 'shortname': 'host_os>linux.tests>test2', + 'tests': 'test2', + 'virt_system': 'linux'}, + {'dep': [], + 'host_os': 'linux', + 'image': 'linux', + 'name': 'host_os>linux.virt_system>windows.tests>wait.long', + 'run': 'wait', + 'shortname': 'host_os>linux.virt_system>windows.tests>wait.long', + 'tests': 'wait', + 'time': 'short_time', + 'virt_system': 'windows'}, + {'dep': ['host_os>linux.virt_system>windows.tests>wait.long'], + 'host_os': 'linux', + 'image': 'linux', + 'name': 'host_os>linux.virt_system>windows.tests>wait.short', + 'run': 'wait', + 'shortname': 'host_os>linux.virt_system>windows.tests>wait.short', + 'tests': 'wait', + 'time': 'logn_time', + 'virt_system': 'windows'}, + {'dep': [], + 'host_os': 'linux', + 'image': 'linux', + 'name': 'host_os>linux.virt_system>windows.tests>test2', + 'run': 'test1', + 'shortname': 'host_os>linux.virt_system>windows.tests>test2', + 'tests': 'test2', + 'virt_system': 'windows'}, + ]) def testHugeTest1(self): self._checkConfigDump('testcfg.huge/test1.cfg', 'testcfg.huge/test1.cfg.repr.gz')