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

Merge pull request #25 from ActiveState/travis_test_fix 

Test fixes for travis-ci
This commit is contained in:
Sridhar Ratnakumar 2014-03-21 22:35:31 -07:00
parent 0383a079b7 3da62cd5ae
commit 24d682e8af
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tail_test.go
View File

@ -132,10 +132,13 @@ func TestLocationMiddle(_t *testing.T) {
func _TestReOpen(_t *testing.T, poll bool) { func _TestReOpen(_t *testing.T, poll bool) {
var name string var name string
var delay time.Duration
if poll { if poll {
name = "reopen-polling" name = "reopen-polling"
delay = 300 * time.Millisecond // account for POLL_DURATION
} else { } else {
name = "reopen-inotify" name = "reopen-inotify"
delay = 100 * time.Millisecond
} }
t := NewTailTest(name, _t) t := NewTailTest(name, _t)
t.CreateFile("test.txt", "hello\nworld\n") t.CreateFile("test.txt", "hello\nworld\n")
@ -146,22 +149,22 @@ func _TestReOpen(_t *testing.T, poll bool) {
go t.VerifyTailOutput(tail, []string{"hello", "world", "more", "data", "endofworld"}) go t.VerifyTailOutput(tail, []string{"hello", "world", "more", "data", "endofworld"})
// deletion must trigger reopen // deletion must trigger reopen
<-time.After(100 * time.Millisecond) <-time.After(delay)
t.RemoveFile("test.txt") t.RemoveFile("test.txt")
<-time.After(100 * time.Millisecond) <-time.After(delay)
t.CreateFile("test.txt", "more\ndata\n") t.CreateFile("test.txt", "more\ndata\n")
// rename must trigger reopen // rename must trigger reopen
<-time.After(100 * time.Millisecond) <-time.After(delay)
t.RenameFile("test.txt", "test.txt.rotated") t.RenameFile("test.txt", "test.txt.rotated")
<-time.After(100 * time.Millisecond) <-time.After(delay)
t.CreateFile("test.txt", "endofworld") t.CreateFile("test.txt", "endofworld")
// Delete after a reasonable delay, to give tail sufficient time // Delete after a reasonable delay, to give tail sufficient time
// to read all lines. // to read all lines.
<-time.After(100 * time.Millisecond) <-time.After(delay)
t.RemoveFile("test.txt") t.RemoveFile("test.txt")
<-time.After(100 * time.Millisecond) <-time.After(delay)
// Do not bother with stopping as it could kill the tomb during // Do not bother with stopping as it could kill the tomb during
// the reading of data written above. Timings can vary based on // the reading of data written above. Timings can vary based on