net: align temporary file, directory names in tests

Also adds missing temporary file deletion.

Change-Id: Ia644b0898022e05d2f5232af38f51d55e40c6fb5
Reviewed-on: https://go-review.googlesource.com/9772
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go
index d046fc415ed0255b4a24ab729e7c95760b0d792c..1b88e7762b5055472890fadff9b090b88fe11982 100644 (file)
--- a/src/net/dnsclient_unix_test.go
+++ b/src/net/dnsclient_unix_test.go
@@ -101,7 +101,7 @@ type resolvConfTest struct {
 }
 
 func newResolvConfTest(t *testing.T) *resolvConfTest {
-       dir, err := ioutil.TempDir("", "resolvConfTest")
+       dir, err := ioutil.TempDir("", "go-resolvconftest")
        if err != nil {
                t.Fatal(err)
        }

diff --git a/src/net/error_test.go b/src/net/error_test.go
index 9776a2a3b00b2e55c6523e724d3d5f91e583e769..c65d3f9d8a5ca72868af6d176de4c32f89098750 100644 (file)
--- a/src/net/error_test.go
+++ b/src/net/error_test.go
@@ -524,10 +524,11 @@ func TestFileError(t *testing.T) {
                t.Skip("not supported on %s", runtime.GOOS)
        }
 
-       f, err := ioutil.TempFile("", "nettest")
+       f, err := ioutil.TempFile("", "go-nettest")
        if err != nil {
                t.Fatal(err)
        }
+       defer os.Remove(f.Name())
        defer f.Close()
 
        c, err := FileConn(f)

diff --git a/src/net/mockserver_test.go b/src/net/mockserver_test.go
index 75085a553540e5be85b307fd514c029c73dcbfc1..62bcfa4022ed5ab2b756a9e12cb850b3dcb9d1f6 100644 (file)
--- a/src/net/mockserver_test.go
+++ b/src/net/mockserver_test.go
@@ -18,7 +18,7 @@ import (
 // It also uses /tmp directory in case it is prohibited to create UNIX
 // sockets in TMPDIR.
 func testUnixAddr() string {
-       f, err := ioutil.TempFile("", "nettest")
+       f, err := ioutil.TempFile("", "go-nettest")
        if err != nil {
                panic(err)
        }