aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Makefile3
-rw-r--r--test/asf/asfframework.py2
-rw-r--r--test/asf/test_quic.py14
-rw-r--r--test/asf/test_session_sdl.py5
-rw-r--r--test/asf/test_tcp.py2
-rw-r--r--test/asf/test_tls.py2
-rw-r--r--test/test_pg_stream.py13
-rw-r--r--test/test_udp.py2
-rw-r--r--test/vpp_iperf.py41
9 files changed, 57 insertions, 27 deletions
diff --git a/test/Makefile b/test/Makefile
index de3a3ca2a52..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
@@ -423,6 +423,7 @@ cov-post: wipe-cov $(BUILD_COV_DIR)
-o $(BUILD_COV_DIR)/coverage-filtered$(HS_TEST).info
@genhtml $(BUILD_COV_DIR)/coverage-filtered$(HS_TEST).info \
--output-directory $(BUILD_COV_DIR)/html
+ @rm -f $(BUILD_COV_DIR)/html/cmd_line
@test -z "$(EXTERN_COV_DIR)" || \
genhtml $(BUILD_COV_DIR)/extern-coverage$(HS_TEST).info \
--output-directory $(BUILD_COV_DIR)/extern-html
diff --git a/test/asf/asfframework.py b/test/asf/asfframework.py
index 8e565d26a52..7670a0753d1 100644
--- a/test/asf/asfframework.py
+++ b/test/asf/asfframework.py
@@ -652,8 +652,6 @@ class VppAsfTestCase(CPUInterface, unittest.TestCase):
cls.pump_thread.start()
if cls.debug_gdb or cls.debug_gdbserver or cls.debug_attach:
cls.vapi_response_timeout = 0
- elif config.gcov:
- cls.vapi_response_timeout = 20
cls.vapi = VppPapiProvider(cls.__name__, cls, cls.vapi_response_timeout)
if cls.step:
hook = hookmodule.StepHook(cls)
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_session_sdl.py b/test/asf/test_session_sdl.py
index 53301f7bd6c..d2e30daa9f2 100644
--- a/test/asf/test_session_sdl.py
+++ b/test/asf/test_session_sdl.py
@@ -5,6 +5,7 @@ import unittest
from framework import VppTestCase
from asfframework import VppTestRunner, tag_fixme_vpp_workers
from ipaddress import IPv4Network, IPv6Network
+from config import config
from vpp_ip_route import (
VppIpRoute,
@@ -25,6 +26,10 @@ class TestSessionSDL(VppTestCase):
@classmethod
def setUpClass(cls):
+ # increase vapi timeout, to avoid
+ # failures reported on test-cov
+ if config.gcov:
+ cls.vapi_response_timeout = 20
super(TestSessionSDL, cls).setUpClass()
@classmethod
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_pg_stream.py b/test/test_pg_stream.py
index 471c85c43f0..915a5aa73d9 100644
--- a/test/test_pg_stream.py
+++ b/test/test_pg_stream.py
@@ -11,6 +11,7 @@ from scapy.layers.inet6 import IPv6
from framework import VppTestCase
from asfframework import VppTestRunner
+from config import config
class TestPgStream(VppTestCase):
@@ -19,6 +20,18 @@ class TestPgStream(VppTestCase):
def __init__(self, *args):
VppTestCase.__init__(self, *args)
+ @classmethod
+ def setUpClass(cls):
+ # increase vapi timeout, to avoid
+ # failures reported on test-cov
+ if config.gcov:
+ cls.vapi_response_timeout = 20
+ super(TestPgStream, cls).setUpClass()
+
+ @classmethod
+ def tearDownClass(cls):
+ super(TestPgStream, cls).tearDownClass()
+
def setUp(self):
super(TestPgStream, self).setUp()
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__":