From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id D36DF58CB for ; Thu, 21 May 2015 08:58:15 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 20 May 2015 23:58:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,466,1427785200"; d="scan'208";a="698170004" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 20 May 2015 23:58:12 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t4L6wA3I029613; Thu, 21 May 2015 14:58:10 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t4L6w88e011440; Thu, 21 May 2015 14:58:10 +0800 Received: (from jingguox@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t4L6w8Dl011436; Thu, 21 May 2015 14:58:08 +0800 From: Jingguo Fu To: dts@dpdk.org Date: Thu, 21 May 2015 14:58:03 +0800 Message-Id: <1432191483-11406-1-git-send-email-jingguox.fu@intel.com> X-Mailer: git-send-email 1.7.4.1 Cc: jingguox.fu@intel.com Subject: [dts] [PATCH] blacklist suite: fix cases for framework update X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2015 06:58:16 -0000 Signed-off-by: Jingguo Fu --- tests/TestSuite_blacklist.py | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/tests/TestSuite_blacklist.py b/tests/TestSuite_blacklist.py index 8e9debd..04425ba 100644 --- a/tests/TestSuite_blacklist.py +++ b/tests/TestSuite_blacklist.py @@ -31,29 +31,20 @@ """ DPDK Test suite. - Test device blacklisting. - """ - import dts - - from test_case import TestCase from pmd_output import PmdOutput - -class TestBlacklist(TestCase): - +class TestBlackList(TestCase): def set_up_all(self): """ Run at the start of each test suite. - Blacklist Prerequisites. Requirements: Two Ports """ - self.ports = self.dut.get_ports() self.verify(len(self.ports) >= 2, "Insufficient ports for testing") [arch, machine, self.env, toolchain] = self.target.split('-') @@ -87,9 +78,7 @@ class TestBlacklist(TestCase): regexp_blacklisted_port = self.regexp_blacklisted_port % (int(pci.split(':')[0], 16), pci.split(':')[1]) else: regexp_blacklisted_port = self.regexp_blacklisted_port % self.dut.ports_info[port]['pci'] - matching_ports = dts.regexp(output, regexp_blacklisted_port, True) - if blacklisted: self.verify(len(matching_ports) == 1, "Blacklisted port is being initialized") @@ -101,7 +90,7 @@ class TestBlacklist(TestCase): """ Run testpmd with no blacklisted device. """ - out = self.pmdout.start_testpmd("all") + out = self.pmdout.start_testpmd("Default") rexp = r"Link" match_status = dts.regexp(out, rexp, True) @@ -112,9 +101,7 @@ class TestBlacklist(TestCase): Run testpmd with one port blacklisted. """ self.dut.kill_all() - - out = self.pmdout.start_testpmd("all", eal_param="-b 0000:%s -- -i" % self.dut.ports_info[0]['pci']) - + out = self.pmdout.start_testpmd("Default", eal_param="-b 0000:%s -- -i" % self.dut.ports_info[0]['pci']) self.check_blacklisted_ports(out, self.ports[1:]) def test_bl_allbutoneportblacklisted(self): @@ -122,18 +109,13 @@ class TestBlacklist(TestCase): Run testpmd with all but one port blacklisted. """ self.dut.kill_all() - ports_to_blacklist = self.ports[:-1] - cmdline = "" for port in ports_to_blacklist: cmdline += " -b 0000:%s" % self.dut.ports_info[port]['pci'] - - out = self.pmdout.start_testpmd("all", eal_param=cmdline) - + out = self.pmdout.start_testpmd("Default", eal_param=cmdline) blacklisted_ports = self.check_blacklisted_ports(out, - ports_to_blacklist, - True) + ports_to_blacklist, True) def tear_down(self): """ @@ -141,7 +123,6 @@ class TestBlacklist(TestCase): Quit testpmd. """ self.dut.send_expect("quit", "# ", 10) - def tear_down_all(self): """ Run after each test suite. -- 2.1.0