]> Cypherpunks repositories - gostls13.git/commitdiff
crypto/x509: save the temp dir in TestReadUniqueDirectoryEntries
authorBryan C. Mills <bcmills@google.com>
Tue, 19 May 2020 18:17:05 +0000 (14:17 -0400)
committerBryan C. Mills <bcmills@google.com>
Tue, 19 May 2020 18:43:29 +0000 (18:43 +0000)
In CL 231958, TempDir was changed to create a new temp directory on
each allocation, on the theory that it is easy to save in a variable
for callers that want the same directory repeatedly. Apply that
transformation here.

Updates #38850

Change-Id: Ibb014095426c33038e0a2c95303579cf95d5c3ba
Reviewed-on: https://go-review.googlesource.com/c/go/+/234582
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/crypto/x509/root_unix_test.go

index 39556ae60d379f036f9522451a5c4f00c90c1099..5a8015429c0091e80a5c2bf10715319aa1686afe 100644 (file)
@@ -204,7 +204,8 @@ func TestLoadSystemCertsLoadColonSeparatedDirs(t *testing.T) {
 }
 
 func TestReadUniqueDirectoryEntries(t *testing.T) {
-       temp := func(base string) string { return filepath.Join(t.TempDir(), base) }
+       tmp := t.TempDir()
+       temp := func(base string) string { return filepath.Join(tmp, base) }
        if f, err := os.Create(temp("file")); err != nil {
                t.Fatal(err)
        } else {
@@ -216,7 +217,7 @@ func TestReadUniqueDirectoryEntries(t *testing.T) {
        if err := os.Symlink("../target-out", temp("link-out")); err != nil {
                t.Fatal(err)
        }
-       got, err := readUniqueDirectoryEntries(t.TempDir())
+       got, err := readUniqueDirectoryEntries(tmp)
        if err != nil {
                t.Fatal(err)
        }