[dts] [PATCH V1] tests/TestSuite_kernelpf_iavf.py:An abnormal exit needs to execute the same command as a normal exit.

Peng Zhihong zhihongx.peng at intel.com
Wed Nov 6 08:54:30 CET 2019


An abnormal exit needs to execute the same command as a normal exit.

Signed-off-by: Peng Zhihong <zhihongx.peng at intel.com>
---
 tests/TestSuite_kernelpf_iavf.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index 668eb28..89c22d3 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -47,6 +47,7 @@ from pmd_output import PmdOutput
 from settings import HEADER_SIZE
 from packet import Packet
 from utils import RED
+from exception import VerifyFailure
 
 VM_CORES_MASK = 'all'
 MAX_VLAN = 4095
@@ -336,18 +337,27 @@ class TestKernelpfIavf(TestCase):
         self.vm_testpmd.execute_cmd("start")
         self.send_random_pkt(self.vf_mac, count=1)
         out = self.vm_dut.get_session_output()
-        self.verify(self.vf_mac in out, 'vf receive pkt fail with current mac')
+        if self.vf_mac not in out:
+            self.dut.send_expect("ip link set dev %s vf 0 trust off" % self.host_intf, "# ")
+            raise VerifyFailure('allmulti all off vf receive pkt fail with current mac')
         self.send_random_pkt(multicast_mac, count=1)
         out = self.vm_dut.get_session_output()
-        self.verify(multicast_mac not in out, 'vf receive pkt with multicast mac')
+        if multicast_mac in out:
+            self.dut.send_expect("ip link set dev %s vf 0 trust off" % self.host_intf, "# ")
+            raise VerifyFailure('allmulti all off vf receive pkt with multicast mac')
 
         self.vm_testpmd.execute_cmd("set allmulti all on")
         self.send_random_pkt(self.vf_mac, count=1)
         out = self.vm_dut.get_session_output()
-        self.verify(self.vf_mac in out, 'vf receive pkt fail with current mac')
+        if self.vf_mac not in out:
+            self.dut.send_expect("ip link set dev %s vf 0 trust off" % self.host_intf, "# ")
+            raise VerifyFailure('allmulti all on vf receive pkt fail with current mac')
         self.send_random_pkt(multicast_mac, count=1)
         out = self.vm_dut.get_session_output()
-        self.verify(multicast_mac in out, 'vf receive pkt fail with multicast mac')
+        if multicast_mac not in out:
+            self.dut.send_expect("ip link set dev %s vf 0 trust off" % self.host_intf, "# ")
+            raise VerifyFailure('allmulti all on vf receive pkt fail with multicast mac')
+
         self.dut.send_expect("ip link set dev %s vf 0 trust off" % self.host_intf, "# ")
 
     def test_vf_broadcast(self):
-- 
2.17.1



More information about the dts mailing list