[dts] [DTS][PATCH] fix dts bugs for 1.1 branch

Jingguo Fu jingguox.fu at intel.com
Wed Jun 3 11:07:45 CEST 2015


Signed-off-by: Jingguo Fu <jingguox.fu at intel.com>
---
 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



More information about the dts mailing list