From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konstantin Khorenko Date: Mon, 24 Aug 2026 16:54:32 +0200 Subject: [Devel] [PATCH RHEL10 COMMIT] selftests: ve_printk: match the conntrack overflow message In-Reply-To: <20260824145337.457808-1-khorenko@virtuozzo.com> Message-ID: <202608241454.67OEsWUX457936@hci8VM.finist.virtuozzo.com> List-Id: The commit is pushed to "branch-rh10-6.12.0-211.39.1.16.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git after rh10-6.12.0-211.39.1.16.8.vz10 ------> commit b8602e1ad08847d26d25dbf1426cf1247ef24c26 Author: Eva Kurchatova Date: Fri Aug 21 18:32:21 2026 +0300 selftests: ve_printk: match the conntrack overflow message The kernel prints VE%s: nf_conntrack table full in netns %u, dropping packet while the test looks for "nf_conntrack table full, dropping packet". The "in netns %u" part sits between the two halves the test expects to be adjacent, so strstr() never matched: ve_log_both counted zero messages and failed even when the container produced all ten of them. Match the part of the message which carries no netns number, and drop the stale quote from the comment above the test. Fixes: d5ec8836f50d ("tests: add ve_printk selftest") https://virtuozzo.atlassian.net/browse/VSTOR-139673 Feature: fix vz selftests Signed-off-by: Eva Kurchatova Signed-off-by: Konstantin Khorenko --- tools/testing/selftests/ve_printk/ve_printk_test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/ve_printk/ve_printk_test.c b/tools/testing/selftests/ve_printk/ve_printk_test.c index 2df672d75e00..020df691e5d5 100644 --- a/tools/testing/selftests/ve_printk/ve_printk_test.c +++ b/tools/testing/selftests/ve_printk/ve_printk_test.c @@ -286,7 +286,7 @@ int ve_printk_test_logboth(void) ret = TEST_RATELIMIT_BURST; /* verify that only 10 records were added */ while (fgets(buf, sizeof(buf), pdmesg)) { - if (strstr(buf, "nf_conntrack table full, dropping packet")) { + if (strstr(buf, "nf_conntrack table full")) { ret--; } } @@ -614,10 +614,10 @@ TEST_F(ve_printk, ve0_log) * Test verifies net_veboth_ratelimited function which logs messages simultaneously * to both the container (VE_LOG) and VE0 (VE0_LOG), but with ratelimit throttling. * Inside the container, a small conntrack table (size 2) is configured, then many ping - * packets are sent, causing table overflow and generation of "nf_conntrack table full, - * dropping packet" messages. The test verifies that exactly TEST_RATELIMIT_BURST (10) - * messages appeared on the host - ratelimit should limit the number of messages even - * if more were generated. + * packets are sent, causing table overflow and generation of "nf_conntrack table + * full in netns N, dropping packet" messages. The test verifies that exactly + * TEST_RATELIMIT_BURST (10) messages appeared on the host - ratelimit should + * limit the number of messages even if more were generated. */ TEST_F(ve_printk, ve_log_both) { @@ -635,7 +635,7 @@ TEST_F(ve_printk, ve_log_both) ASSERT_EQ(ret, 0); while (fgets(buf, sizeof(buf), fdmesg)) { - if (strstr(buf, "nf_conntrack table full, dropping packet")) { + if (strstr(buf, "nf_conntrack table full")) { ret++; } }