summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchangru <changrux.fan@intel.com>2015-08-11 03:04:44 -0400
committerMarvin Liu <yong.liu@intel.com>2015-08-13 14:23:24 +0800
commit7fcd8f2ff2527192c88f570f66e4378f6efb8dcd (patch)
tree509fec0fd72010f65b61aa4fbfb7818e72c7d082
parent836e580abe87becc244265120e1f64d11ce1036c (diff)
downloaddts-7fcd8f2ff2527192c88f570f66e4378f6efb8dcd.zip
dts-7fcd8f2ff2527192c88f570f66e4378f6efb8dcd.tar.gz
dts-7fcd8f2ff2527192c88f570f66e4378f6efb8dcd.tar.xz
fix issue of dpdk early quit in vlan
Signed-off-by: changru <changrux.fan@intel.com>
-rw-r--r--tests/TestSuite_vlan.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py
index 318b3ca..ab778f3 100644
--- a/tests/TestSuite_vlan.py
+++ b/tests/TestSuite_vlan.py
@@ -171,7 +171,7 @@ class TestVlan(TestCase):
self.vlan_send_packet(self.vlan)
out = self.get_tcpdump_package()
self.verify("vlan %d" % self.vlan not in out, "Wrong vlan:" + out)
- out = self.dut.send_expect("quit", "#", 120)
+ out = self.dut.send_expect("stop", "testpmd> ", 120)
def test_vlan_strip_config_off(self):
@@ -207,11 +207,8 @@ class TestVlan(TestCase):
out = self.get_tcpdump_package()
self.verify("vlan %d" % self.vlan in out, "Wrong vlan: " + out)
- if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "redrockcanyou"]:
- self.dut.send_expect("tx_vlan reset %s" % dutTxPortId, "testpmd> ", 30)
- self.dut.send_expect("stop", "testpmd> ", 30)
- else:
- self.dut.send_expect("quit", "# ", 30)
+ self.dut.send_expect("tx_vlan reset %s" % dutTxPortId, "testpmd> ", 30)
+ self.dut.send_expect("stop", "testpmd> ", 30)
def tear_down(self):
"""
@@ -223,4 +220,5 @@ class TestVlan(TestCase):
"""
Run after each test suite.
"""
+ self.dut.kill_all()
pass