From fc34db6db12a03d064778153dbcb0b873e6f2e37 Mon Sep 17 00:00:00 2001 From: Viktor Liu Date: Mon, 4 May 2026 11:49:47 +0200 Subject: [PATCH] Validate ip6tables-save stderr in nftables compatibility test --- client/firewall/nftables/manager_linux_test.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/client/firewall/nftables/manager_linux_test.go b/client/firewall/nftables/manager_linux_test.go index 4563db67d..be4f65881 100644 --- a/client/firewall/nftables/manager_linux_test.go +++ b/client/firewall/nftables/manager_linux_test.go @@ -503,12 +503,16 @@ func runIp6tablesSave(t *testing.T) (string, string) { func verifyIp6tablesOutput(t *testing.T, stdout, stderr string) { t.Helper() - require.NotContains(t, stdout, "Table `nat' is incompatible", - "ip6tables-save: nat table incompatible. Full output: %s", stdout) - require.NotContains(t, stdout, "Table `mangle' is incompatible", - "ip6tables-save: mangle table incompatible. Full output: %s", stdout) - require.NotContains(t, stdout, "Table `filter' is incompatible", - "ip6tables-save: filter table incompatible. Full output: %s", stdout) + for _, msg := range []string{ + "Table `nat' is incompatible", + "Table `mangle' is incompatible", + "Table `filter' is incompatible", + } { + require.NotContains(t, stdout, msg, + "ip6tables-save stdout reports incompatibility: %s", stdout) + require.NotContains(t, stderr, msg, + "ip6tables-save stderr reports incompatibility: %s", stderr) + } } func TestNftablesManagerCompatibilityWithIptablesFor6kPrefixes(t *testing.T) {