From 6ca3fa5552b1a7681ed1c86a93526ed8627c7682 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Mon, 18 Nov 2024 14:33:50 +0100 Subject: [PATCH] Fix nolintlint Semantic merge conflict ... See: 9267e8731 ("Enable nolintlint linter") See: 4280a0dbe ("Enable unparam linter") Signed-off-by: Tom Wieczorek --- pkg/kubernetes/watch/watcher_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubernetes/watch/watcher_test.go b/pkg/kubernetes/watch/watcher_test.go index 69e2ce3129e9..57183453f8f6 100644 --- a/pkg/kubernetes/watch/watcher_test.go +++ b/pkg/kubernetes/watch/watcher_test.go @@ -496,7 +496,7 @@ func TestWatcher(t *testing.T) { return nil } - second = func(opts metav1.ListOptions) error { // nolint:unparam // error required to satisfy interface + second = func(opts metav1.ListOptions) error { //nolint:unparam // error required to satisfy interface assert.Equal(t, "the bookmark", opts.ResourceVersion) assert.True(t, opts.AllowWatchBookmarks) @@ -508,7 +508,7 @@ func TestWatcher(t *testing.T) { return nil } - third = func(opts metav1.ListOptions) error { // nolint:unparam // error required to satisfy interface + third = func(opts metav1.ListOptions) error { //nolint:unparam // error required to satisfy interface assert.Equal(t, "someConfigMap", opts.ResourceVersion) assert.True(t, opts.AllowWatchBookmarks)