tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

testing: update internal/watch to use the tempdir fixture (#862)

This commit is contained in:
Nick Santos 2018-12-19 18:56:40 -05:00 committed by Nicolas De loof
parent 139edc403f
commit 1fd7ca5440
1 changed files with 61 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
pkg/watch/notify_test.go
View File

@ -8,6 +8,8 @@ import (
"strings" "strings"
"testing" "testing"
"time" "time"
"github.com/windmilleng/tilt/internal/testutils/tempdir"
) )
// Each implementation of the notify interface should have the same basic // Each implementation of the notify interface should have the same basic
@ -26,12 +28,9 @@ func TestEventOrdering(t *testing.T) {
count := 8 count := 8
dirs := make([]string, count) dirs := make([]string, count)
for i, _ := range dirs { for i, _ := range dirs {
dir, err := f.root.NewDir("watched") dir := f.TempDir("watched")
if err != nil { dirs[i] = dir
t.Fatal(err) err := f.notify.Add(dir)
}
dirs[i] = dir.Path()
err = f.notify.Add(dir.Path())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -58,20 +57,14 @@ func TestWatchesAreRecursive(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
root, err := f.root.NewDir("root") root := f.TempDir("root")
if err != nil {
t.Fatal(err)
}
// add a sub directory // add a sub directory
subPath := filepath.Join(root.Path(), "sub") subPath := filepath.Join(root, "sub")
err = os.MkdirAll(subPath, os.ModePerm) f.MkdirAll(subPath)
if err != nil {
t.Fatal(err)
}
// watch parent // watch parent
err = f.notify.Add(root.Path()) err := f.notify.Add(root)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -92,24 +85,20 @@ func TestNewDirectoriesAreRecursivelyWatched(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
root, err := f.root.NewDir("root") root := f.TempDir("root")
if err != nil {
t.Fatal(err)
}
// watch parent // watch parent
err = f.notify.Add(root.Path()) err := f.notify.Add(root)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
f.fsync() f.fsync()
f.events = nil f.events = nil
// add a sub directory // add a sub directory
subPath := filepath.Join(root.Path(), "sub") subPath := filepath.Join(root, "sub")
err = os.MkdirAll(subPath, os.ModePerm) f.MkdirAll(subPath)
if err != nil {
f.t.Fatal(err)
}
// change something inside sub directory // change something inside sub directory
changeFilePath := filepath.Join(subPath, "change") changeFilePath := filepath.Join(subPath, "change")
_, err = os.OpenFile(changeFilePath, os.O_RDONLY|os.O_CREATE, 0666) _, err = os.OpenFile(changeFilePath, os.O_RDONLY|os.O_CREATE, 0666)
@ -123,25 +112,18 @@ func TestWatchNonExistentPath(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
root, err := f.root.NewDir("root") root := f.TempDir("root")
if err != nil { path := filepath.Join(root, "change")
t.Fatal(err)
}
path := filepath.Join(root.Path(), "change") err := f.notify.Add(path)
err = f.notify.Add(path)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
f.fsync() f.fsync()
d1 := []byte("hello\ngo\n") d1 := "hello\ngo\n"
err = ioutil.WriteFile(path, d1, 0644) f.WriteFile(path, d1)
if err != nil {
t.Fatal(err)
}
f.assertEvents(path) f.assertEvents(path)
} }
@ -149,22 +131,13 @@ func TestRemove(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
root, err := f.root.NewDir("root") root := f.TempDir("root")
if err != nil { path := filepath.Join(root, "change")
t.Fatal(err)
}
path := filepath.Join(root.Path(), "change") d1 := "hello\ngo\n"
f.WriteFile(path, d1)
if err != nil { err := f.notify.Add(path)
t.Fatal(err)
}
d1 := []byte("hello\ngo\n")
err = ioutil.WriteFile(path, d1, 0644)
if err != nil {
t.Fatal(err)
}
err = f.notify.Add(path)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -181,7 +154,7 @@ func TestRemoveAndAddBack(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
path := filepath.Join(f.watched.Path(), "change") path := filepath.Join(f.watched, "change")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
err := ioutil.WriteFile(path, d1, 0644) err := ioutil.WriteFile(path, d1, 0644)
@ -214,23 +187,13 @@ func TestSingleFile(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
root, err := f.root.NewDir("root") root := f.TempDir("root")
if err != nil { path := filepath.Join(root, "change")
t.Fatal(err)
}
path := filepath.Join(root.Path(), "change") d1 := "hello\ngo\n"
f.WriteFile(path, d1)
if err != nil { err := f.notify.Add(path)
t.Fatal(err)
}
d1 := []byte("hello\ngo\n")
err = ioutil.WriteFile(path, d1, 0644)
if err != nil {
t.Fatal(err)
}
err = f.notify.Add(path)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -248,8 +211,8 @@ func TestWriteBrokenLink(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
link := filepath.Join(f.watched.Path(), "brokenLink") link := filepath.Join(f.watched, "brokenLink")
missingFile := filepath.Join(f.watched.Path(), "missingFile") missingFile := filepath.Join(f.watched, "missingFile")
err := os.Symlink(missingFile, link) err := os.Symlink(missingFile, link)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -262,13 +225,13 @@ func TestWriteGoodLink(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
goodFile := filepath.Join(f.watched.Path(), "goodFile") goodFile := filepath.Join(f.watched, "goodFile")
err := ioutil.WriteFile(goodFile, []byte("hello"), 0644) err := ioutil.WriteFile(goodFile, []byte("hello"), 0644)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
link := filepath.Join(f.watched.Path(), "goodFileSymlink") link := filepath.Join(f.watched, "goodFileSymlink")
err = os.Symlink(goodFile, link) err = os.Symlink(goodFile, link)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -307,27 +270,17 @@ func TestMoveAndReplace(t *testing.T) {
f := newNotifyFixture(t) f := newNotifyFixture(t)
defer f.tearDown() defer f.tearDown()
root, err := f.root.NewDir("root") root := f.TempDir("root")
file := filepath.Join(root, "myfile")
f.WriteFile(file, "hello")
err := f.notify.Add(file)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
file := filepath.Join(root.Path(), "myfile") tmpFile := filepath.Join(root, ".myfile.swp")
err = ioutil.WriteFile(file, []byte("hello"), 0777) f.WriteFile(tmpFile, "world")
if err != nil {
t.Fatal(err)
}
err = f.notify.Add(file)
if err != nil {
t.Fatal(err)
}
tmpFile := filepath.Join(root.Path(), ".myfile.swp")
err = ioutil.WriteFile(tmpFile, []byte("world"), 0777)
if err != nil {
t.Fatal(err)
}
err = os.Rename(tmpFile, file) err = os.Rename(tmpFile, file)
if err != nil { if err != nil {
@ -338,10 +291,9 @@ func TestMoveAndReplace(t *testing.T) {
} }
type notifyFixture struct { type notifyFixture struct {
t *testing.T *tempdir.TempDirFixture
root *TempDir
watched *TempDir
notify Notify notify Notify
watched string
events []FileEvent events []FileEvent
} }
@ -352,23 +304,15 @@ func newNotifyFixture(t *testing.T) *notifyFixture {
t.Fatal(err) t.Fatal(err)
} }
root, err := NewDir(t.Name()) f := tempdir.NewTempDirFixture(t)
if err != nil { watched := f.TempDir("watched")
t.Fatal(err)
}
watched, err := root.NewDir("watched") err = notify.Add(watched)
if err != nil {
t.Fatal(err)
}
err = notify.Add(watched.Path())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
return &notifyFixture{ return &notifyFixture{
t: t, TempDirFixture: f,
root: root,
watched: watched, watched: watched,
notify: notify, notify: notify,
} }
@ -378,33 +322,30 @@ func (f *notifyFixture) assertEvents(expected ...string) {
f.fsync() f.fsync()
if len(f.events) != len(expected) { if len(f.events) != len(expected) {
f.t.Fatalf("Got %d events (expected %d): %v %v", len(f.events), len(expected), f.events, expected) f.T().Fatalf("Got %d events (expected %d): %v %v", len(f.events), len(expected), f.events, expected)
} }
for i, actual := range f.events { for i, actual := range f.events {
e := FileEvent{expected[i]} e := FileEvent{expected[i]}
if actual != e { if actual != e {
f.t.Fatalf("Got event %v (expected %v)", actual, e) f.T().Fatalf("Got event %v (expected %v)", actual, e)
} }
} }
} }
func (f *notifyFixture) fsync() { func (f *notifyFixture) fsync() {
syncPathBase := fmt.Sprintf("sync-%d.txt", time.Now().UnixNano()) syncPathBase := fmt.Sprintf("sync-%d.txt", time.Now().UnixNano())
syncPath := filepath.Join(f.watched.Path(), syncPathBase) syncPath := filepath.Join(f.watched, syncPathBase)
anySyncPath := filepath.Join(f.watched.Path(), "sync-") anySyncPath := filepath.Join(f.watched, "sync-")
timeout := time.After(time.Second) timeout := time.After(time.Second)
err := ioutil.WriteFile(syncPath, []byte(fmt.Sprintf("%s", time.Now())), os.FileMode(0777)) f.WriteFile(syncPath, fmt.Sprintf("%s", time.Now()))
if err != nil {
f.t.Fatal(err)
}
F: F:
for { for {
select { select {
case err := <-f.notify.Errors(): case err := <-f.notify.Errors():
f.t.Fatal(err) f.T().Fatal(err)
case event := <-f.notify.Events(): case event := <-f.notify.Events():
if strings.Contains(event.Path, syncPath) { if strings.Contains(event.Path, syncPath) {
@ -423,24 +364,18 @@ F:
f.events = append(f.events, event) f.events = append(f.events, event)
case <-timeout: case <-timeout:
f.t.Fatalf("fsync: timeout") f.T().Fatalf("fsync: timeout")
} }
} }
if err != nil {
f.t.Fatal(err)
}
} }
func (f *notifyFixture) tearDown() { func (f *notifyFixture) tearDown() {
SetLimitChecksEnabled(true) SetLimitChecksEnabled(true)
err := f.root.TearDown()
err := f.notify.Close()
if err != nil { if err != nil {
f.t.Fatal(err) f.T().Fatal(err)
} }
err = f.notify.Close() f.TempDirFixture.TearDown()
if err != nil {
f.t.Fatal(err)
}
} }