From e03a0bc105ffa41b79f5545517a488ba8b17bcf9 Mon Sep 17 00:00:00 2001 From: songlh Date: Sat, 18 Dec 2021 19:20:15 -0500 Subject: [PATCH 1/2] fixing the panic in TestVersion --- pkg/kubelet/cri/remote/remote_runtime_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/cri/remote/remote_runtime_test.go b/pkg/kubelet/cri/remote/remote_runtime_test.go index 44ef6aa11ce..194aeb029f4 100644 --- a/pkg/kubelet/cri/remote/remote_runtime_test.go +++ b/pkg/kubelet/cri/remote/remote_runtime_test.go @@ -67,7 +67,8 @@ func TestVersion(t *testing.T) { r := createRemoteRuntimeService(endpoint, t) version, err := r.Version(apitest.FakeVersion) - assert.NoError(t, err) - assert.Equal(t, apitest.FakeVersion, version.Version) - assert.Equal(t, apitest.FakeRuntimeName, version.RuntimeName) + if assert.NoError(t, err) { + assert.Equal(t, apitest.FakeVersion, version.Version) + assert.Equal(t, apitest.FakeRuntimeName, version.RuntimeName) + } } From 50840f5039735deab6a14bda465beeed9f531619 Mon Sep 17 00:00:00 2001 From: songlh Date: Fri, 14 Jan 2022 21:46:12 -0500 Subject: [PATCH 2/2] change to use require.NoError --- pkg/kubelet/cri/remote/remote_runtime_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/cri/remote/remote_runtime_test.go b/pkg/kubelet/cri/remote/remote_runtime_test.go index 194aeb029f4..ea247342a56 100644 --- a/pkg/kubelet/cri/remote/remote_runtime_test.go +++ b/pkg/kubelet/cri/remote/remote_runtime_test.go @@ -67,8 +67,7 @@ func TestVersion(t *testing.T) { r := createRemoteRuntimeService(endpoint, t) version, err := r.Version(apitest.FakeVersion) - if assert.NoError(t, err) { - assert.Equal(t, apitest.FakeVersion, version.Version) - assert.Equal(t, apitest.FakeRuntimeName, version.RuntimeName) - } + require.NoError(t, err) + assert.Equal(t, apitest.FakeVersion, version.Version) + assert.Equal(t, apitest.FakeRuntimeName, version.RuntimeName) }