From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 74F89558F for ; Thu, 4 Aug 2016 15:18:50 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 04 Aug 2016 06:18:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,470,1464678000"; d="scan'208";a="1008358608" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 04 Aug 2016 06:18:49 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u74DIlEx031477; Thu, 4 Aug 2016 21:18:47 +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 u74DIjvv014762; Thu, 4 Aug 2016 21:18:47 +0800 Received: (from yliu84x@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u74DIiip014758; Thu, 4 Aug 2016 21:18:44 +0800 From: Marvin Liu To: dts@dpdk.org Cc: Marvin Liu Date: Thu, 4 Aug 2016 21:18:34 +0800 Message-Id: <1470316714-14698-5-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1470316714-14698-1-git-send-email-yong.liu@intel.com> References: <1470316714-14698-1-git-send-email-yong.liu@intel.com> Subject: [dts] [PATCH 4/4] tests: fix tope issue in suites 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, 04 Aug 2016 13:18:51 -0000 Signed-off-by: Marvin Liu diff --git a/tests/TestSuite_checksum_offload.py b/tests/TestSuite_checksum_offload.py index 7a05b6d..57069f0 100644 --- a/tests/TestSuite_checksum_offload.py +++ b/tests/TestSuite_checksum_offload.py @@ -63,12 +63,11 @@ class TestChecksumOffload(TestCase): """ Run before each test case. """ - if self.dut.want_func_tests: - self.pmdout.start_testpmd("Default", "--portmask=%s " % - (self.portMask) + "--disable-hw-vlan --enable-rx-cksum " + - "--crc-strip --port-topology=loop", socket=self.ports_socket) - self.dut.send_expect("set verbose 1", "testpmd>") - self.dut.send_expect("set fwd csum", "testpmd>") + self.pmdout.start_testpmd("Default", "--portmask=%s " % + (self.portMask) + "--disable-hw-vlan --enable-rx-cksum " + + "--crc-strip --port-topology=loop", socket=self.ports_socket) + self.dut.send_expect("set verbose 1", "testpmd>") + self.dut.send_expect("set fwd csum", "testpmd>") def checksum_enablehw(self, port): self.dut.send_expect("csum set ip hw %d" % port, "testpmd>") @@ -327,8 +326,7 @@ class TestChecksumOffload(TestCase): """ Run after each test case. """ - if self.dut.want_func_tests: - self.dut.send_expect("quit", "#") + self.dut.send_expect("quit", "#") def tear_down_all(self): """ diff --git a/tests/TestSuite_ipv4_reassembly.py b/tests/TestSuite_ipv4_reassembly.py index a1e15a2..3f0e725 100644 --- a/tests/TestSuite_ipv4_reassembly.py +++ b/tests/TestSuite_ipv4_reassembly.py @@ -305,7 +305,7 @@ class TestIpReassembly(TestCase): """ sent_packets = self.number_of_sent_packets(self.test_config.mac_src) - print 'sent packets: %d - expected: %d' % (sent_packets, expected) + self.logger.info('sent packets: %d - expected: %d' % (sent_packets, expected)) self.verify(sent_packets == expected, 'Not all fragments have been sent') def verify_received_packets(self, expected): @@ -314,7 +314,7 @@ class TestIpReassembly(TestCase): """ received_packets = self.number_of_received_packets(self.test_config.tcp_dst_port) - print 'received packets: %d - expected: %d' % (received_packets, expected) + self.logger.info('received packets: %d - expected: %d' % (received_packets, expected)) self.verify(received_packets == expected, 'Not all frames have been forwarded') @@ -324,7 +324,7 @@ class TestIpReassembly(TestCase): """ tcp_valid_checksum = self.number_of_tcp_valid_checksum(self.test_config.tcp_dst_port) - print 'tcp valid: %d - expected: %d' % (tcp_valid_checksum, expected) + self.logger.info('tcp valid: %d - expected: %d' % (tcp_valid_checksum, expected)) self.verify(tcp_valid_checksum == expected, 'Not all TCP packets have valid checksum') diff --git a/tests/TestSuite_pmd_bonded.py b/tests/TestSuite_pmd_bonded.py index 8b8b8ee..1b3f781 100644 --- a/tests/TestSuite_pmd_bonded.py +++ b/tests/TestSuite_pmd_bonded.py @@ -810,16 +810,12 @@ UDP(sport=srcport, dport=destport)/Raw(load="\x50"*%s)], iface="%s", count=%d)' """ Run before each test case. """ - if self.dut.want_func_tests: - self.launch_app() - elif self.dut.want_perf_tests: + if self._enable_perf: pmd_param = "--burst=32 --rxfreet=32 --mbcache=250 --txpt=32 \ --rxht=8 --rxwt=0 --txfreet=32 --txrst=32 --txqflags=0xf01" self.launch_app(pmd_param) else: - self.verify(False, - "Test type not etting," + - "please check framework to set test type to be function or performance.") + self.launch_app() def verify_bound_basic_opt(self, mode_set): """ -- 1.9.3