From a8cc953517d1e689f501d9fcd7b6659a177d2216 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 18 Apr 2023 13:19:59 +0200 Subject: [PATCH] ssh: skip unsupported tests on wasip1 Updates golang/go#32840 Updates golang/go#58141 Change-Id: Ib4425c1743d417920745205586af250dbf80c7e4 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/485695 Auto-Submit: Tobias Klauser Reviewed-by: Bryan Mills Run-TryBot: Tobias Klauser TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor --- ssh/handshake_test.go | 4 ++-- ssh/test/dial_unix_test.go | 4 ++-- ssh/test/session_test.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ssh/handshake_test.go b/ssh/handshake_test.go index 3d0ab5044c..f190cbfa91 100644 --- a/ssh/handshake_test.go +++ b/ssh/handshake_test.go @@ -421,8 +421,8 @@ func TestHandshakeErrorHandlingWriteCoupled(t *testing.T) { // handshakeTransport deadlocks, the go runtime will detect it and // panic. func testHandshakeErrorHandlingN(t *testing.T, readLimit, writeLimit int, coupled bool) { - if runtime.GOOS == "js" && runtime.GOARCH == "wasm" { - t.Skip("skipping on js/wasm; see golang.org/issue/32840") + if (runtime.GOOS == "js" || runtime.GOOS == "wasip1") && runtime.GOARCH == "wasm" { + t.Skipf("skipping on %s/wasm; see golang.org/issue/32840", runtime.GOOS) } msg := Marshal(&serviceRequestMsg{strings.Repeat("x", int(minRekeyThreshold)/4)}) diff --git a/ssh/test/dial_unix_test.go b/ssh/test/dial_unix_test.go index 2dca0e6117..6d5a735485 100644 --- a/ssh/test/dial_unix_test.go +++ b/ssh/test/dial_unix_test.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !windows && !solaris && !js -// +build !windows,!solaris,!js +//go:build !windows && !solaris && !js && !wasip1 +// +build !windows,!solaris,!js,!wasip1 package test diff --git a/ssh/test/session_test.go b/ssh/test/session_test.go index f88c3b7abc..2d3276993b 100644 --- a/ssh/test/session_test.go +++ b/ssh/test/session_test.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !windows && !solaris && !js -// +build !windows,!solaris,!js +//go:build !windows && !solaris && !js && !wasip1 +// +build !windows,!solaris,!js,!wasip1 package test