From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com [202.81.31.144]) by dpdk.org (Postfix) with ESMTP id AC195374C for ; Tue, 8 Mar 2016 11:08:03 +0100 (CET) Received: from localhost by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Mar 2016 20:08:00 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 8 Mar 2016 20:07:58 +1000 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: gowrishankar.m@linux.vnet.ibm.com X-IBM-RcptTo: dts@dpdk.org Received: from d23relay06.au.ibm.com (d23relay06.au.ibm.com [9.185.63.219]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 1A8F42CE8064 for ; Tue, 8 Mar 2016 21:07:58 +1100 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u28A7oIq8454558 for ; Tue, 8 Mar 2016 21:07:58 +1100 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u28A7PuW025835 for ; Tue, 8 Mar 2016 21:07:25 +1100 Received: from chozha.in.ibm.com (chozha.in.ibm.com [9.124.124.138] (may be forged)) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u28A7Dh8024744 for ; Tue, 8 Mar 2016 21:07:25 +1100 From: Gowrishankar To: dts Date: Tue, 8 Mar 2016 15:36:47 +0530 Message-Id: <1457431607-31596-10-git-send-email-gowrishankar.m@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1457431607-31596-1-git-send-email-gowrishankar.m@linux.vnet.ibm.com> References: <1457431607-31596-1-git-send-email-gowrishankar.m@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16030810-0005-0000-0000-000003844094 Subject: [dts] [PATCH v2 9/9] tests: fix blacklist test to discard extra pci domain id in verification string 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: Tue, 08 Mar 2016 10:08:05 -0000 Discard 0x0000 from expected output as it is now added in pci id tuple. Signed-off-by: Gowrishankar --- tests/TestSuite_blacklist.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_blacklist.py b/tests/TestSuite_blacklist.py index ba39b36..06dbf87 100644 --- a/tests/TestSuite_blacklist.py +++ b/tests/TestSuite_blacklist.py @@ -50,9 +50,9 @@ class TestBlackList(TestCase): [arch, machine, self.env, toolchain] = self.target.split('-') if self.env == 'bsdapp': - self.regexp_blacklisted_port = "EAL: PCI device 0000:%02x:%s on NUMA socket [-0-9]+[^\n]*\nEAL: probe driver[^\n]*\nEAL: Device is blacklisted, not initializing" + self.regexp_blacklisted_port = "EAL: PCI device %02x:%s on NUMA socket [-0-9]+[^\n]*\nEAL: probe driver[^\n]*\nEAL: Device is blacklisted, not initializing" else: - self.regexp_blacklisted_port = "EAL: PCI device 0000:%s on NUMA socket [-0-9]+[^\n]*\nEAL: probe driver[^\n]*\nEAL: Device is blacklisted, not initializing" + self.regexp_blacklisted_port = "EAL: PCI device %s on NUMA socket [-0-9]+[^\n]*\nEAL: probe driver[^\n]*\nEAL: Device is blacklisted, not initializing" self.pmdout = PmdOutput(self.dut) def set_up(self): @@ -101,7 +101,7 @@ class TestBlackList(TestCase): Run testpmd with one port blacklisted. """ self.dut.kill_all() - out = self.pmdout.start_testpmd("Default", eal_param="-b 0000:%s" % self.dut.ports_info[0]['pci']) + out = self.pmdout.start_testpmd("Default", eal_param="-b %s" % self.dut.ports_info[0]['pci']) self.check_blacklisted_ports(out, self.ports[1:]) def test_bl_allbutoneportblacklisted(self): @@ -112,7 +112,7 @@ class TestBlackList(TestCase): ports_to_blacklist = self.ports[:-1] cmdline = "" for port in ports_to_blacklist: - cmdline += " -b 0000:%s" % self.dut.ports_info[port]['pci'] + cmdline += " -b %s" % self.dut.ports_info[port]['pci'] out = self.pmdout.start_testpmd("Default", eal_param=cmdline) blacklisted_ports = self.check_blacklisted_ports(out, ports_to_blacklist, True) -- 1.7.10.4