go-kit
/
tail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81 from hpcloud/fix-race-in-test 

Fixes race in test
This commit is contained in:
Mark Yen 2016-04-08 12:58:07 -07:00
parent 3b00e857b6 b58ee27c66
commit f4e2250826
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
default: test default: test
test: *.go test: *.go
go test -v ./... go test -v -race ./...
fmt: fmt:
gofmt -w . gofmt -w .

11
tail_test.go
View File

@ -25,6 +25,13 @@ func init() {
} }
} }
func TestMain(m *testing.M) {
// Use a smaller poll duration for faster test runs. Keep it below
// 100ms (which value is used as common delays for tests)
watch.POLL_DURATION = 5 * time.Millisecond
os.Exit(m.Run())
}
func TestMustExist(t *testing.T) { func TestMustExist(t *testing.T) {
tail, err := TailFile("/no/such/file", Config{Follow: true, MustExist: true}) tail, err := TailFile("/no/such/file", Config{Follow: true, MustExist: true})
if err == nil { if err == nil {
@ -387,10 +394,6 @@ func NewTailTest(name string, t *testing.T) TailTest {
tt.Fatal(err) tt.Fatal(err)
} }
// Use a smaller poll duration for faster test runs. Keep it below
// 100ms (which value is used as common delays for tests)
watch.POLL_DURATION = 5 * time.Millisecond
return tt return tt
} }