From 7e944d5d747dd4c130dfb5b3125c04d47a8712d3 Mon Sep 17 00:00:00 2001 From: Frame Date: Thu, 23 May 2024 20:11:49 +0800 Subject: [PATCH] koordlet: revise flaky test in pleg (#2060) Signed-off-by: saintube --- pkg/koordlet/pleg/pleg_test.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/koordlet/pleg/pleg_test.go b/pkg/koordlet/pleg/pleg_test.go index 46f741a94..21443478c 100644 --- a/pkg/koordlet/pleg/pleg_test.go +++ b/pkg/koordlet/pleg/pleg_test.go @@ -152,21 +152,6 @@ func TestPlegHandlePodEvents(t *testing.T) { } func TestPlegHandleContainerEvents(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 @@ -194,6 +179,21 @@ func TestPlegHandleContainerEvents(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-" + tc.name) + 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).containerWatcher.Event() <- tc.mockEvent timer := time.NewTimer(100 * time.Millisecond) defer timer.Stop()