From fba46a4bc8d36547b904280fb93c6288cfaf8a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Va=C5=A1ek?= Date: Mon, 13 Oct 2025 15:30:20 +0200 Subject: [PATCH] test: skip ipv6 test correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matej VaĊĦek --- pkg/ssh/ssh_dialer_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/ssh/ssh_dialer_test.go b/pkg/ssh/ssh_dialer_test.go index 1369e89ce3..828a0166fc 100644 --- a/pkg/ssh/ssh_dialer_test.go +++ b/pkg/ssh/ssh_dialer_test.go @@ -44,6 +44,7 @@ type testParams struct { setUpEnv setUpEnvFn skipOnWin bool skipOnRoot bool + requireIPv6 bool CreateError string DialError string } @@ -192,7 +193,8 @@ func TestCreateDialer(t *testing.T) { connConfig.hostIPv6, connConfig.portIPv6, )}, - setUpEnv: all(withoutSSHAgent, withCleanHome, withKnowHosts(connConfig)), + requireIPv6: true, + setUpEnv: all(withoutSSHAgent, withCleanHome, withKnowHosts(connConfig)), }, { name: "broken known host", @@ -361,13 +363,13 @@ func TestCreateDialer(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - u, err := url.Parse(tt.args.connStr) - th.AssertNil(t, err) - - if net.ParseIP(u.Hostname()).To4() == nil && connConfig.hostIPv6 == "" { + if tt.requireIPv6 && connConfig.hostIPv6 == "" { t.Skip("skipping ipv6 test since test environment doesn't support ipv6 connection") } + u, err := url.Parse(tt.args.connStr) + th.AssertNil(t, err) + if tt.skipOnWin && runtime.GOOS == "windows" { t.Skip("skipping this test on windows") }