Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
crypto/x509: save the temp dir in TestReadUniqueDirectoryEntries
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>
  • Loading branch information
bcmills committed May 19, 2020
1 parent 6d6e482 commit 2dbbc86
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/crypto/x509/root_unix_test.go
Expand Up @@ -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 {
Expand All @@ -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)
}
Expand Down

0 comments on commit 2dbbc86

Please sign in to comment.