Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

koordlet: fix flaky test in pleg #2061

Merged
merged 1 commit into from
May 25, 2024
Merged

koordlet: fix flaky test in pleg #2061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions pkg/koordlet/pleg/pleg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,6 @@ func (h *testHandler) OnContainerDeleted(podID, containerID string) {
}

func TestPlegHandlePodEvents(t *testing.T) {
stopCh := make(chan struct{})
defer close(stopCh)

pg, err := NewPLEG("./test")
if err != nil {
t.Fatal(err)
}
pg.(*pleg).podWatcher, _ = NewTestWatcher()
pg.(*pleg).containerWatcher, _ = NewTestWatcher()
go pg.Run(stopCh)

handler := NewTestHandler()
id := pg.AddHandler(handler)
defer pg.RemoverHandler(id)

testCases := []struct {
name string
mockEvent *inotify.Event
Expand Down Expand Up @@ -130,20 +115,37 @@ func TestPlegHandlePodEvents(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
stopCh := make(chan struct{})
defer close(stopCh)

pg, err := NewPLEG("./test")
if err != nil {
t.Fatal(err)
}
pg.(*pleg).podWatcher, _ = NewTestWatcher()
pg.(*pleg).containerWatcher, _ = NewTestWatcher()
go pg.Run(stopCh)

handler := NewTestHandler()
id := pg.AddHandler(handler)
defer pg.RemoverHandler(id)

pg.(*pleg).podWatcher.Event() <- tc.mockEvent
timer := time.NewTimer(100 * time.Millisecond)
defer timer.Stop()
if tc.want {
timer := time.NewTimer(2 * time.Second)
defer timer.Stop()
select {
case evt := <-handler.events:
assert.Equal(t, tc.wantEvent, evt, "unexpected event received "+evt.podID)
case <-timer.C:
t.Errorf("read event timeout")
}
} else {
timer := time.NewTimer(100 * time.Millisecond)
defer timer.Stop()
select {
case evt := <-handler.events:
t.Errorf("unexpceted event received: %v", evt)
t.Errorf("unexpected event received: %v", evt)
case <-timer.C:
}
}
Expand Down Expand Up @@ -182,7 +184,7 @@ func TestPlegHandleContainerEvents(t *testing.T) {
stopCh := make(chan struct{})
defer close(stopCh)

pg, err := NewPLEG("./test-" + tc.name)
pg, err := NewPLEG("./test")
if err != nil {
t.Fatal(err)
}
Expand All @@ -195,19 +197,21 @@ func TestPlegHandleContainerEvents(t *testing.T) {
defer pg.RemoverHandler(id)

pg.(*pleg).containerWatcher.Event() <- tc.mockEvent
timer := time.NewTimer(100 * time.Millisecond)
defer timer.Stop()
if tc.want {
timer := time.NewTimer(2 * time.Second)
defer timer.Stop()
select {
case evt := <-handler.events:
assert.Equal(t, tc.wantEvent, evt, "unexpected event received")
case <-timer.C:
t.Errorf("read event timeout")
}
} else {
timer := time.NewTimer(100 * time.Millisecond)
defer timer.Stop()
select {
case evt := <-handler.events:
t.Errorf("unexpceted event received: %v", evt)
t.Errorf("unexpected event received: %v", evt)
case <-timer.C:
}
}
Expand Down