aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan C. Mills <bcmills@google.com>2023-05-22 11:18:30 -0400
committerGopher Robot <gobot@golang.org>2023-05-30 19:39:43 +0000
commit5036ba77eb229222cbd5dee436949138ea219adf (patch)
treebc4a9a80bcb928169310a710cda20005b802ebcf
parentb249ec56553becadd90fac7ee9f843f45c1d3774 (diff)
downloadgo-5036ba77eb229222cbd5dee436949138ea219adf.tar.gz
go-5036ba77eb229222cbd5dee436949138ea219adf.zip
[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 <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@google.com> Run-TryBot: Bryan Mills <bcmills@google.com> Auto-Submit: Bryan Mills <bcmills@google.com> (cherry picked from commit 10fbd925d6cd6b63acead9fbbfba8963f70a410e) Reviewed-on: https://go-review.googlesource.com/c/go/+/499297 Reviewed-by: Bryan Mills <bcmills@google.com> Auto-Submit: Dmitri Shuralyov <dmitshur@google.com> Run-TryBot: Dmitri Shuralyov <dmitshur@google.com>
-rw-r--r--src/net/file_unix_test.go4
1 files changed, 4 insertions, 0 deletions
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()