github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove duplicated cleaning up func

Browse Source
This commit is contained in:
yue9944882 2018-06-08 14:28:19 +08:00
parent a221218681
commit d467b29c5c
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/kubelet/config/file_linux_test.go
View File

@ -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) {
} }
} }
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 {