tests: fix a couple bugs in the tests

Author: choppsv1

README.org

@@ -651,15 +651,3 @@ status:  |
 browse:     'q' - quit, 'd' - dashboard, 'u' - util, 's' - streams, 'l' - latency,
 dashboard:  'n' - reset view, 'o' - owned ports, 'a' - all ports, 'c' - clear,
 
-
-
-
-* Issues to close
-** tcpdump test/veth (non-phy) bad perf
-- When 2 packets are sent performance is horrendous.
-  - there's a 200ms pause after EGRESS sends a 2 inner pkt IPTFS packet.
-  - use pkt-size 1400 and inner pkt size of 625 to get this, or similar
-  - [not] this acutally appears to be some sort of bug with chained skbuffs and veths
-  - even lineraizing the buffer stillk see problem
-  - saw one run with corruption on other side
-  - physical interface runs seem fine

tests/manual/tcpdump/tcpdump.py

@@ -56,7 +56,8 @@ async def _test_iperf(unet, astepf, ipsec_intf):
 
     # check the sum inside iptfs code with printk
 
-    pktsize = "40"
+    pktsize = "128"
+    # pktsize = None
 
     logging.info("Starting iperf server on h2")
     sargs = ["iperf3" if iperf3 else "iperf", "-s"]
@@ -71,7 +72,7 @@ async def _test_iperf(unet, astepf, ipsec_intf):
         if use_udp:
             cargs = ["-u", "-b", udp_brate, "-l", pktsize]
         else:
-            cargs = ["-M", pktsize]
+            cargs = ["-M", pktsize] if pktsize else []
             if not iperf3:
                 cargs.append("-m")
 

tests/stress/stress.py

@@ -152,7 +152,7 @@ async def _test_policy_small_pkt(unet, pytestconfig):
     duration = pytestconfig.getoption("--duration")
     iptfs_opts = pytestconfig.getoption("--iptfs-opts")
     mode = pytestconfig.getoption("--mode")
-    rate = convert_number(pytestconfig.getoption("--rate")) / connections
+    rate = convert_number(pytestconfig.getoption("--rate", "8M")) / connections
 
     await setup_policy_tun(
         unet, ipsec_intf="eth1", mode=mode, iptfs_opts=iptfs_opts, trex=True
@@ -203,7 +203,7 @@ async def _test_policy_imix(unet, pytestconfig):
     duration = pytestconfig.getoption("--duration")
     iptfs_opts = pytestconfig.getoption("--iptfs-opts")
     mode = pytestconfig.getoption("--mode")
-    rate = convert_number(pytestconfig.getoption("--rate")) / connections
+    rate = convert_number(pytestconfig.getoption("--rate", "40M")) / connections
 
     await setup_policy_tun(
         unet, ipsec_intf="eth1", mode=mode, iptfs_opts=iptfs_opts, trex=True

tests/stress/test_stress.py

@@ -82,9 +82,9 @@ async def test_net_up(unet):
     logging.debug(r2.conrepl.cmd_raises("ping -w1 -i.2 -c1 11.0.0.1"))
 
 
-async def test_policy_small_pkt(unet):
-    await _test_policy_small_pkt(unet, convert_number("8M"))
+async def test_policy_small_pkt(unet, pytestconfig):
+    await _test_policy_small_pkt(unet, pytestconfig)
 
 
-async def test_policy_imix(unet):
-    await _test_policy_imix(unet, convert_number("40M"))
+async def test_policy_imix(unet, pytestconfig):
+    await _test_policy_imix(unet, pytestconfig)