From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 8DEF45A56 for ; Wed, 3 Jun 2015 11:07:53 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 03 Jun 2015 02:07:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,546,1427785200"; d="scan'208";a="719903015" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga001.fm.intel.com with ESMTP; 03 Jun 2015 02:07:51 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t5397nCa014634; Wed, 3 Jun 2015 17:07:49 +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 t5397l57029780; Wed, 3 Jun 2015 17:07:49 +0800 Received: (from jingguox@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t5397lVG029776; Wed, 3 Jun 2015 17:07:47 +0800 From: Jingguo Fu To: dts@dpdk.org Date: Wed, 3 Jun 2015 17:07:45 +0800 Message-Id: <1433322465-29746-1-git-send-email-jingguox.fu@intel.com> X-Mailer: git-send-email 1.7.4.1 Cc: Jingguo Fu Subject: [dts] [DTS][PATCH] fix dts bugs for 1.1 branch 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: Wed, 03 Jun 2015 09:07:54 -0000 Signed-off-by: Jingguo Fu --- framework/ssh_pexpect.py | 2 +- tests/TestSuite_hello_world.py | 7 ++----- tests/TestSuite_jumboframes.py | 5 ++--- tests/TestSuite_shutdown_api.py | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/framework/ssh_pexpect.py b/framework/ssh_pexpect.py index fa2b542..a474500 100644 --- a/framework/ssh_pexpect.py +++ b/framework/ssh_pexpect.py @@ -30,7 +30,7 @@ class SSHPexpect(object): else: self.session.login(self.host, self.username, self.password, original_prompt='[$#>]') - self.send_expect('stty -echo', '# ', timeout=2) + self.send_expect('stty -echo', '# ', timeout=2) except Exception, e: print RED(e) if getattr(self, 'port', None): diff --git a/tests/TestSuite_hello_world.py b/tests/TestSuite_hello_world.py index 985d8b5..255a8aa 100644 --- a/tests/TestSuite_hello_world.py +++ b/tests/TestSuite_hello_world.py @@ -37,7 +37,6 @@ Test HelloWorld example. import dts from test_case import TestCase - class TestHelloWorld(TestCase): def set_up_all(self): @@ -68,8 +67,7 @@ class TestHelloWorld(TestCase): cores = self.dut.get_core_list('1S/1C/1T') coreMask = dts.create_mask(cores) cmdline = "./examples/helloworld/build/app/helloworld -n 1 -c " + coreMask - out = self.dut.send_expect(cmdline, "# ", 3) - + out = self.dut.send_expect(cmdline, "# ", 30) self.verify("hello from core %s" % cores[0] in out, "EAL not started on core%s" % cores[0]) def test_hello_world_all_cores(self): @@ -83,8 +81,7 @@ class TestHelloWorld(TestCase): coreMask = dts.create_mask(cores) cmdline = "./examples/helloworld/build/app/helloworld -n 1 -c " + coreMask - out = self.dut.send_expect(cmdline, "# ", 5) - + out = self.dut.send_expect(cmdline, "# ", 50) for i in range(len(cores)): self.verify("hello from core %s" % cores[i] in out, "EAL not started on core%s" % cores[i]) diff --git a/tests/TestSuite_jumboframes.py b/tests/TestSuite_jumboframes.py index 3add9ea..4f34c13 100644 --- a/tests/TestSuite_jumboframes.py +++ b/tests/TestSuite_jumboframes.py @@ -37,7 +37,6 @@ Test the support of Jumbo Frames by Poll Mode Drivers import dts import re from time import sleep - from test_case import TestCase from pmd_output import PmdOutput @@ -97,8 +96,8 @@ class TestJumboframes(TestCase): self.verify(p0tx_pkts == p1rx_pkts and p0tx_bytes == pktsize and p1rx_bytes == pktsize, "packet pass assert error") else: - self.verify(p0tx_pkts == p1rx_pkts and (p1rx_err == 1 or p1rx_pkts == 0), - "packet drop assert error") + #self.verify(p0tx_pkts == p1rx_pkts and (p1rx_err == 1 or p1rx_pkts == 0), + self.verify(p1rx_err == 1 or p0tx_pkts == 0, "packet drop assert error") return out # diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py index fd38ae8..0706303 100644 --- a/tests/TestSuite_shutdown_api.py +++ b/tests/TestSuite_shutdown_api.py @@ -13,7 +13,7 @@ import re import os from test_case import TestCase from pmd_output import PmdOutput -from setting import HEADER_SIZE +from settings import HEADER_SIZE # # -- 1.8.1.4