From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 21 Feb 2019 00:34:48 +0000 (-0800)
Subject: net: remove unixgram test sockets
X-Git-Tag: go1.13beta1~1363
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b97e40fc30843ebbb91f1ae38599a883498d828a;p=gostls13.git

net: remove unixgram test sockets

Updates https://gcc.gnu.org/PR89406

Change-Id: Iccf2760e42e9caa90720b96e74a805a9c0d48f35
Reviewed-on: https://go-review.googlesource.com/c/163277
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Mikio Hara <mikioh.public.networking@gmail.com>
Reviewed-by: Than McIntosh <thanm@google.com>
---

diff --git a/src/net/listen_test.go b/src/net/listen_test.go
index 6c3f70cc7b..6c9b92a9fc 100644
--- a/src/net/listen_test.go
+++ b/src/net/listen_test.go
@@ -780,6 +780,9 @@ func TestListenConfigControl(t *testing.T) {
 				continue
 			}
 			c.Close()
+			if network == "unixgram" {
+				os.Remove(address)
+			}
 		}
 	})
 }
diff --git a/src/net/mockserver_test.go b/src/net/mockserver_test.go
index 530293578a..e085f4440b 100644
--- a/src/net/mockserver_test.go
+++ b/src/net/mockserver_test.go
@@ -17,8 +17,6 @@ import (
 )
 
 // testUnixAddr uses ioutil.TempFile to get a name that is unique.
-// It also uses /tmp directory in case it is prohibited to create UNIX
-// sockets in TMPDIR.
 func testUnixAddr() string {
 	f, err := ioutil.TempFile("", "go-nettest")
 	if err != nil {
diff --git a/src/net/splice_test.go b/src/net/splice_test.go
index 4c300172c5..e2a6638e8f 100644
--- a/src/net/splice_test.go
+++ b/src/net/splice_test.go
@@ -242,6 +242,7 @@ func testSpliceNoUnixgram(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer os.Remove(addr.Name)
 	up, err := ListenUnixgram("unixgram", addr)
 	if err != nil {
 		t.Fatal(err)