Commit 5dc8c4db authored by Russ Cox's avatar Russ Cox

path/filepath: fix race with other tests

Bug3486 tried to walk the entire file tree, but other tests might
be creating and removing files in that tree. In particular, package os
creates and removes files in the os directory, and issue 5863
reports failures due to seeing those files appear and then disappear.

Change the test to walk just the test tree, which should not be
changing.

Fixes #5863.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/13467045
parent 10c36fbc
......@@ -927,27 +927,32 @@ func TestDriveLetterInEvalSymlinks(t *testing.T) {
}
func TestBug3486(t *testing.T) { // http://code.google.com/p/go/issues/detail?id=3486
root, err := filepath.EvalSymlinks(runtime.GOROOT())
root, err := filepath.EvalSymlinks(runtime.GOROOT() + "/test")
if err != nil {
t.Fatal(err)
}
lib := filepath.Join(root, "lib")
src := filepath.Join(root, "src")
seenSrc := false
bugs := filepath.Join(root, "bugs")
ken := filepath.Join(root, "ken")
seenBugs := false
seenKen := false
filepath.Walk(root, func(pth string, info os.FileInfo, err error) error {
if err != nil {
t.Fatal(err)
}
switch pth {
case lib:
case bugs:
seenBugs = true
return filepath.SkipDir
case src:
seenSrc = true
case ken:
if !seenBugs {
t.Fatal("filepath.Walk out of order - ken before bugs")
}
seenKen = true
}
return nil
})
if !seenSrc {
t.Fatalf("%q not seen", src)
if !seenKen {
t.Fatalf("%q not seen", ken)
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment