Skip to content

Commit ff0a099

Browse files
committed
fix test issue
1 parent 1e33cdd commit ff0a099

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

pkg/kernelmonitor/kernel_log_watcher.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,10 @@ func (k *kernelLogWatcher) watchLoop() {
168168

169169
// getLogReader gets a kernel log reader.
170170
func getLogReader(path string) (io.Reader, error) {
171-
reader, err := tryJournal()
172-
if err == nil {
173-
return reader, nil
171+
if len(path) != 0 {
172+
return tryLogFile(path)
174173
}
175-
reader, err = tryLogFile(path)
176-
if err == nil {
177-
return reader, nil
178-
}
179-
return nil, err
174+
return tryJournal()
180175
}
181176

182177
func tryJournal() (io.Reader, error) {
@@ -205,6 +200,7 @@ func tryLogFile(path string) (io.Reader, error) {
205200
return nil, err
206201
}
207202
glog.Infof("Kernel log watcher use log file: %s", path)
203+
time.Sleep(1000 * time.Millisecond)
208204
return tail, nil
209205
}
210206

pkg/kernelmonitor/kernel_log_watcher_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,15 @@ func TestWatch(t *testing.T) {
100100
t.Fatal(err)
101101
}
102102
defer func() {
103-
f.Close()
104103
os.Remove(f.Name())
105104
}()
106105
_, err = f.Write([]byte(test.log))
107106
if err != nil {
108107
t.Fatal(err)
109108
}
109+
110+
f.Close()
111+
110112
w := NewKernelLogWatcher(WatcherConfig{KernelLogPath: f.Name(), Lookback: test.lookback})
111113
// Set the fake clock.
112114
w.(*kernelLogWatcher).clock = fakeClock

0 commit comments

Comments
 (0)