From 5036ba77eb229222cbd5dee436949138ea219adf Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Mon, 22 May 2023 11:18:30 -0400 Subject: [PATCH] [release-branch.go1.20] net: skip TestFileFdBlocks if the "unix" network is not supported This may fix the android failures observed starting at CL 496715, such as the one in https://build.golang.org/log/a92cc6d5fa36bc31858631bacf2d8eacd93709a6. For #60217. Change-Id: I4e8eaf9890da269bd1758f59a29fa2a8131d8ae6 Reviewed-on: https://go-review.googlesource.com/c/go/+/496955 TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor Run-TryBot: Bryan Mills Auto-Submit: Bryan Mills (cherry picked from commit 10fbd925d6cd6b63acead9fbbfba8963f70a410e) Reviewed-on: https://go-review.googlesource.com/c/go/+/499297 Reviewed-by: Bryan Mills Auto-Submit: Dmitri Shuralyov Run-TryBot: Dmitri Shuralyov --- src/net/file_unix_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/net/file_unix_test.go b/src/net/file_unix_test.go index 0a8badf23f..0499a02404 100644 --- a/src/net/file_unix_test.go +++ b/src/net/file_unix_test.go @@ -14,6 +14,10 @@ import ( // For backward compatibility, opening a net.Conn, turning it into an os.File, // and calling the Fd method should return a blocking descriptor. func TestFileFdBlocks(t *testing.T) { + if !testableNetwork("unix") { + t.Skipf("skipping: unix sockets not supported") + } + ls := newLocalServer(t, "unix") defer ls.teardown() -- 2.50.0