selftests: netfilter: fix conntrack_dump_flush retval on unsupported kernel
Subsystems (4)
Florian Westphal
maintainerPATCH 1/1 selftests: netfilter: fix conntrack_dump_flush retval on unsupported kernel
With CONFIG_NETFILTER=n test passes instead of skip. Before:
./run_kselftest.sh -t net/netfilter:conntrack_dump_flush
[..]
# Starting 3 tests from 1 test cases.
# RUN conntrack_dump_flush.test_dump_by_zone ...
mnl_socket_open: Protocol not supported
[..]
ok 3 conntrack_dump_flush.test_flush_by_zone_default # PASSED: 3 / 3 tests passed.
# Totals: pass:3 fail:0 xfail:0 xpass:0 skip:0 error:0
After:
mnl_socket_open: Protocol not supported
[..]
ok 3 conntrack_dump_flush.test_flush_by_zone_default # SKIP cannot open netlink_netfilter socket # PASSED: 3 / 3 tests passed.
# Totals: pass:0 fail:0 xfail:0 xpass:0 skip:3 error:0
--- .../selftests/net/netfilter/conntrack_dump_flush.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
tools/testing/selftests/net/netfilter/conntrack_dump_flush.c +3 -5
@@ -313,13 +313,11 @@ FIXTURE_SETUP(conntrack_dump_flush) self->sock =mnl_socket_open (NETLINK_NETFILTER );if (!self->sock) {perror ("mnl_socket_open" ); -exit (EXIT_FAILURE ); +SKIP (return,"cannot open netlink_netfilter socket" ); } -if (mnl_socket_bind (self->sock,0 ,MNL_SOCKET_AUTOPID ) <0 ) { -perror ("mnl_socket_bind" ); -exit (EXIT_FAILURE ); - } + ret =mnl_socket_bind (self->sock,0 ,MNL_SOCKET_AUTOPID ); +EXPECT_EQ (ret,0 ); ret =conntracK_count_zone (self->sock,TEST_ZONE_ID );if (ret <0 && errno ==EPERM )
Signature · 1 line
2.43.2
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 12 lines · On Mon, 22 Apr 2024 12:33:53 +0200 you wrote:
With
CONFIG_NETFILTER=ntest passes instead of skip. Before:./run_kselftest.sh -t net/netfilter:conntrack_dump_flush
[..]
# Starting 3 tests from 1 test cases.
# RUN conntrack_dump_flush.test_dump_by_zone ...
mnl_socket_open: Protocol not supported
[..]
ok 3 conntrack_dump_flush.test_flush_by_zone_default # PASSED: 3 / 3 tests passed.
# Totals: pass:3 fail:0 xfail:0 xpass:0 skip:0 error:0
Quoted 1 line
[...]
Here is the summary with links:
- [net-next] selftests: netfilter: fix conntrack_dump_flush retval on unsupported kernel
https://git.kernel.org/netdev/net-next/c/dd99c29e83e4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html