Commit d467b29c authored by yue9944882's avatar yue9944882

remove duplicated cleaning up func

parent a2212186
...@@ -321,10 +321,6 @@ func watchFileChanged(watchDir bool, symlink bool, t *testing.T) { ...@@ -321,10 +321,6 @@ func watchFileChanged(watchDir bool, symlink bool, t *testing.T) {
if watchDir { if watchDir {
NewSourceFile(dirName, hostname, 100*time.Millisecond, ch) NewSourceFile(dirName, hostname, 100*time.Millisecond, ch)
defer func() {
// Remove the file
deleteFile(dirName, fileName, ch, t)
}()
} else { } else {
NewSourceFile(file, hostname, 100*time.Millisecond, ch) NewSourceFile(file, hostname, 100*time.Millisecond, ch)
} }
...@@ -363,22 +359,6 @@ func watchFileChanged(watchDir bool, symlink bool, t *testing.T) { ...@@ -363,22 +359,6 @@ func watchFileChanged(watchDir bool, symlink bool, t *testing.T) {
} }
} }
func deleteFile(dir, file string, ch chan interface{}, t *testing.T) {
path := filepath.Join(dir, file)
if _, err := os.Stat(path); err != nil {
// The file might absent if it's renamed, deleted..
return
}
go func() {
err := os.Remove(path)
if err != nil {
t.Errorf("unable to remove test file %s: %s", path, err)
}
}()
expectEmptyUpdate(t, ch)
}
func expectUpdate(t *testing.T, ch chan interface{}, testCase *testCase) { func expectUpdate(t *testing.T, ch chan interface{}, testCase *testCase) {
timer := time.After(5 * time.Second) timer := time.After(5 * time.Second)
for { for {
......
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