@@ -43,21 +43,6 @@ class TestQueueStartStop(TestCase):
"""
Run before each test case.
"""
- try:
- patch_file = FOLDERS["Depends"] + r"/macfwd_log.patch"
- except:
- self.logger.warning(str(FOLDERS))
- patch_file = r"dep/macfwd_log.patch"
- FOLDERS["Depends"] = "dep"
- patch_dst = "/tmp/"
-
- # dpdk patch and build
- try:
- self.dut.session.copy_file_to(patch_file, patch_dst)
- self.patch_hotfix_dpdk(patch_dst + "macfwd_log.patch", True)
- self.dut.build_install_dpdk(self.target)
- except Exception as e:
- raise IOError("dpdk setup failure: %s" % e)
def check_forwarding(self, ports, nic, pktSize=64, received=True):
self.send_packet(ports[0], ports[1], self.nic, pktSize, received)
@@ -85,20 +70,6 @@ class TestQueueStartStop(TestCase):
else:
self.verify(len(sniff_pkts) == 0, "stop queue not work as expected")
- def patch_hotfix_dpdk(self, patch_dir, on=True):
- """
- This function is to apply or remove patch for dpdk.
- patch_dir: the abs path of the patch
- on: True for apply, False for remove
- """
- try:
- if on:
- self.dut.send_expect("patch -p0 < %s" % patch_dir, "[~|~\]]# ")
- else:
- self.dut.send_expect("patch -p0 -R < %s" % patch_dir, "[~|~\]]# ")
- except Exception as e:
- raise ValueError("patch_hotfix_dpdk failure: %s" % e)
-
def test_queue_start_stop(self):
"""
queue start/stop test
@@ -114,6 +85,7 @@ class TestQueueStartStop(TestCase):
)
time.sleep(5)
self.dut.send_expect("set fwd mac", "testpmd>")
+ self.dut.send_expect("set verbose 1", "testpmd>")
self.dut.send_expect("start", "testpmd>")
self.check_forwarding([0, 0], self.nic)
except Exception as e:
@@ -138,7 +110,7 @@ class TestQueueStartStop(TestCase):
except Exception as e:
raise IOError("queue start/stop forward failure: %s" % e)
self.verify(
- "ports 0 queue 0 receive " not in out,
+ "port 0/queue 0: received 1 packets" not in out,
"start queue revice package failed, out = %s" % out,
)
@@ -153,7 +125,7 @@ class TestQueueStartStop(TestCase):
except Exception as e:
raise IOError("queue start/stop forward failure: %s" % e)
self.verify(
- "ports 0 queue 0 receive " in out,
+ "port 0/queue 0: received 1 packets" in out,
"start queue revice package failed, out = %s" % out,
)
@@ -161,7 +133,6 @@ class TestQueueStartStop(TestCase):
"""
Run after each test case.
"""
- patch_dst = "/tmp/"
try:
self.dut.send_expect("stop", "testpmd>")
@@ -169,13 +140,6 @@ class TestQueueStartStop(TestCase):
except:
print("Failed to quit testpmd")
- self.dut.kill_all()
-
- try:
- self.patch_hotfix_dpdk(patch_dst + "macfwd_log.patch", False)
- except Exception as e:
- print(("patch_hotfix_dpdk remove failure :%s" % e))
-
def tear_down_all(self):
"""
Run after each test suite.