diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/asf/test_quic.py | 14 | ||||
| -rw-r--r-- | test/asf/test_tcp.py | 2 | ||||
| -rw-r--r-- | test/asf/test_tls.py | 2 | ||||
| -rw-r--r-- | test/test_udp.py | 2 | ||||
| -rw-r--r-- | test/vpp_iperf.py | 41 |
6 files changed, 38 insertions, 25 deletions
diff --git a/test/Makefile b/test/Makefile index 37f8e2db18b..6196be80a18 100644 --- a/test/Makefile +++ b/test/Makefile @@ -402,7 +402,7 @@ endif LCOV_VERSION=$(shell lcov --version | sed -E 's/^lcov: LCOV version ([0-9]+)[.].*/\1/') LCOV_IGNORE_ERRORS= ifeq ($(LCOV_VERSION),2) -LCOV_IGNORE_ERRORS=--ignore-errors unused,empty,mismatch,gcov +LCOV_IGNORE_ERRORS=--ignore-errors unused,empty,mismatch,gcov,negative endif .PHONY: cov-post diff --git a/test/asf/test_quic.py b/test/asf/test_quic.py index c4fa6912114..78ebe0f40a7 100644 --- a/test/asf/test_quic.py +++ b/test/asf/test_quic.py @@ -178,7 +178,7 @@ class QUICEchoIntTransferTestCase(QUICEchoIntTestCase): def test_quic_int_transfer(self): """QUIC internal transfer""" self.server() - self.client("mbytes", "2") + self.client("bytes", "2m") @tag_fixme_vpp_workers @@ -188,11 +188,11 @@ class QUICEchoIntSerialTestCase(QUICEchoIntTestCase): def test_quic_serial_int_transfer(self): """QUIC serial internal transfer""" self.server() - self.client("mbytes", "2") - self.client("mbytes", "2") - self.client("mbytes", "2") - self.client("mbytes", "2") - self.client("mbytes", "2") + self.client("bytes", "2m") + self.client("bytes", "2m") + self.client("bytes", "2m") + self.client("bytes", "2m") + self.client("bytes", "2m") @tag_fixme_vpp_workers @@ -202,7 +202,7 @@ class QUICEchoIntMStreamTestCase(QUICEchoIntTestCase): def test_quic_int_multistream_transfer(self): """QUIC internal multi-stream transfer""" self.server() - self.client("nclients", "10", "mbytes", "1") + self.client("nclients", "10", "bytes", "1m") class QUICEchoExtTestCase(QUICTestCase): diff --git a/test/asf/test_tcp.py b/test/asf/test_tcp.py index 23772d34c76..e9c9e1efb68 100644 --- a/test/asf/test_tcp.py +++ b/test/asf/test_tcp.py @@ -89,7 +89,7 @@ class TestTCP(VppAsfTestCase): self.assertNotIn("failed", error) error = self.vapi.cli( - "test echo client mbytes 10 appns 1 " + "test echo client bytes 10m appns 1 " + "fifo-size 4k test-bytes " + "syn-timeout 2 uri " + uri diff --git a/test/asf/test_tls.py b/test/asf/test_tls.py index 2ce87143339..6676132417c 100644 --- a/test/asf/test_tls.py +++ b/test/asf/test_tls.py @@ -142,7 +142,7 @@ class TestTLS(VppAsfTestCase): self.assertNotIn("failed", error) error = self.vapi.cli( - "test echo client mbytes 10 appns 1 " + "test echo client bytes 10m appns 1 " "fifo-size 4k test-bytes " "tls-engine 1 " "syn-timeout 2 uri " + uri diff --git a/test/test_udp.py b/test/test_udp.py index 6315f0efd5e..c7620fb7e9d 100644 --- a/test/test_udp.py +++ b/test/test_udp.py @@ -764,7 +764,7 @@ class TestUDP(VppTestCase): self.assertNotIn("failed", error) error = self.vapi.cli( - "test echo client mbytes 10 appns 1 " + "test echo client bytes 10m appns 1 " + "fifo-size 4k " + "syn-timeout 2 uri " + uri diff --git a/test/vpp_iperf.py b/test/vpp_iperf.py index b325399f8e1..03ced8bf12f 100644 --- a/test/vpp_iperf.py +++ b/test/vpp_iperf.py @@ -5,6 +5,8 @@ import subprocess import os import sys +import time +import signal class VppIperf: @@ -196,20 +198,31 @@ def start_iperf( def stop_iperf(iperf_cmd): """Stop the iperf process matching the iperf_cmd string.""" - args = ["pgrep", "-x", "-f", iperf_cmd] - p = subprocess.Popen( - args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding="utf-8" - ) - stdout, _ = p.communicate() - for pid in stdout.split(): - try: - subprocess.run( - f"kill -9 {pid}", - encoding="utf-8", - shell=True, - ) - except Exception: - pass + try: + result = subprocess.run( + ["pgrep", "-x", "-f", iperf_cmd], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + encoding="utf-8", + ) + pids = result.stdout.strip().split() + if not pids: + # No matching iperf3 processes found + return + + for pid in pids: + try: + # First send SIGTERM to cleanup and notify the parent process + os.kill(int(pid), signal.SIGTERM) + time.sleep(2) + os.kill(int(pid), 0) # Check if still alive + os.kill(int(pid), signal.SIGKILL) + except ProcessLookupError: + pass # Process already exited + except Exception as e: + print(f"Error terminating iperf3 process {pid}: {e}") + except Exception as e: + print(f"Failed to run pgrep for '{iperf_cmd}': {e}") if __name__ == "__main__": |