From 48ea6fc4651802c50f7e554516edc0958827f00d Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 27 Nov 2024 17:11:04 +0200 Subject: [PATCH] oom_watcher: fix testifylint failures Fixed the following testifylint failures: oom_watcher_linux_test.go:68:2: require-error: for error assertions use require (testifylint) assert.NoError(t, oomWatcher.Start(tCtx, node)) ^ oom_watcher_linux_test.go:128:2: require-error: for error assertions use require (testifylint) assert.NoError(t, oomWatcher.Start(tCtx, node)) ^ oom_watcher_linux_test.go:165:2: require-error: for error assertions use require (testifylint) assert.NoError(t, oomWatcher.Start(tCtx, node)) ^ --- pkg/kubelet/oom/oom_watcher_linux_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/oom/oom_watcher_linux_test.go b/pkg/kubelet/oom/oom_watcher_linux_test.go index 3b7a5ee92f8..cd3a975712f 100644 --- a/pkg/kubelet/oom/oom_watcher_linux_test.go +++ b/pkg/kubelet/oom/oom_watcher_linux_test.go @@ -27,6 +27,7 @@ import ( "github.com/google/cadvisor/utils/oomparser" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) type fakeStreamer struct { @@ -65,7 +66,7 @@ func TestWatcherRecordsEventsForOomEvents(t *testing.T) { recorder: fakeRecorder, oomStreamer: fakeStreamer, } - assert.NoError(t, oomWatcher.Start(tCtx, node)) + require.NoError(t, oomWatcher.Start(tCtx, node)) eventsRecorded := getRecordedEvents(fakeRecorder, numExpectedOomEvents) assert.Len(t, eventsRecorded, numExpectedOomEvents) @@ -125,7 +126,7 @@ func TestWatcherRecordsEventsForOomEventsCorrectContainerName(t *testing.T) { recorder: fakeRecorder, oomStreamer: fakeStreamer, } - assert.NoError(t, oomWatcher.Start(tCtx, node)) + require.NoError(t, oomWatcher.Start(tCtx, node)) eventsRecorded := getRecordedEvents(fakeRecorder, numExpectedOomEvents) assert.Len(t, eventsRecorded, numExpectedOomEvents) @@ -162,7 +163,7 @@ func TestWatcherRecordsEventsForOomEventsWithAdditionalInfo(t *testing.T) { recorder: fakeRecorder, oomStreamer: fakeStreamer, } - assert.NoError(t, oomWatcher.Start(tCtx, node)) + require.NoError(t, oomWatcher.Start(tCtx, node)) eventsRecorded := getRecordedEvents(fakeRecorder, numExpectedOomEvents)