From e70a2ad828194fad953d3e3335b59623493ddb04 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 9 Sep 2024 22:18:07 +0300 Subject: [PATCH] Kubelet: DRA: fix testify errors --- pkg/kubelet/cm/dra/claiminfo_test.go | 17 +++++++++-------- pkg/kubelet/cm/dra/manager_test.go | 10 +++++----- pkg/kubelet/cm/dra/plugin/plugin_test.go | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkg/kubelet/cm/dra/claiminfo_test.go b/pkg/kubelet/cm/dra/claiminfo_test.go index 139ecc8c9e2..6092763225a 100644 --- a/pkg/kubelet/cm/dra/claiminfo_test.go +++ b/pkg/kubelet/cm/dra/claiminfo_test.go @@ -23,6 +23,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" resourceapi "k8s.io/api/resource/v1alpha3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -307,7 +308,7 @@ func TestClaimInfoHasPodReference(t *testing.T) { }, } { t.Run(test.description, func(t *testing.T) { - assert.Equal(t, test.claimInfo.hasPodReference(podUID), test.expectedResult) + assert.Equal(t, test.expectedResult, test.claimInfo.hasPodReference(podUID)) }) } } @@ -401,7 +402,7 @@ func TestClaimInfoIsPrepared(t *testing.T) { }, } { t.Run(test.description, func(t *testing.T) { - assert.Equal(t, test.claimInfo.isPrepared(), test.expectedResult) + assert.Equal(t, test.expectedResult, test.claimInfo.isPrepared()) }) } } @@ -440,7 +441,7 @@ func TestNewClaimInfoCache(t *testing.T) { assert.Error(t, err) return } - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, result) }) } @@ -494,7 +495,7 @@ func TestClaimInfoCacheWithLock(t *testing.T) { } { t.Run(test.description, func(t *testing.T) { cache, err := newClaimInfoCache(t.TempDir(), "test-checkpoint") - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, cache) err = cache.withLock(test.funcGen(cache)) if test.wantErr { @@ -554,7 +555,7 @@ func TestClaimInfoCacheWithRLock(t *testing.T) { } { t.Run(test.description, func(t *testing.T) { cache, err := newClaimInfoCache(t.TempDir(), "test-checkpoint") - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, cache) err = cache.withRLock(test.funcGen(cache)) if test.wantErr { @@ -583,7 +584,7 @@ func TestClaimInfoCacheAdd(t *testing.T) { } { t.Run(test.description, func(t *testing.T) { cache, err := newClaimInfoCache(t.TempDir(), "test-checkpoint") - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, cache) cache.add(test.claimInfo) assert.True(t, cache.contains(test.claimInfo.ClaimName, test.claimInfo.Namespace)) @@ -754,13 +755,13 @@ func TestSyncToCheckpoint(t *testing.T) { } { t.Run(test.description, func(t *testing.T) { cache, err := newClaimInfoCache(test.stateDir, test.checkpointName) - assert.NoError(t, err) + require.NoError(t, err) err = cache.syncToCheckpoint() if test.wantErr { assert.Error(t, err) return } - assert.NoError(t, err) + require.NoError(t, err) }) } } diff --git a/pkg/kubelet/cm/dra/manager_test.go b/pkg/kubelet/cm/dra/manager_test.go index adf0305eaf1..30ec100ade4 100644 --- a/pkg/kubelet/cm/dra/manager_test.go +++ b/pkg/kubelet/cm/dra/manager_test.go @@ -196,7 +196,7 @@ func TestNewManagerImpl(t *testing.T) { return } - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, manager.cache) assert.NotNil(t, manager.kubeClient) }) @@ -355,7 +355,7 @@ func TestGetResources(t *testing.T) { } { t.Run(test.description, func(t *testing.T) { manager, err := NewManagerImpl(kubeClient, t.TempDir(), "worker") - assert.NoError(t, err) + require.NoError(t, err) if test.claimInfo != nil { manager.cache.add(test.claimInfo) @@ -593,7 +593,7 @@ func TestPrepareResources(t *testing.T) { return // PrepareResources returned an error so stopping the test case here } - assert.NoError(t, err) + require.NoError(t, err) if test.wantResourceSkipped { return // resource skipped so no need to continue @@ -735,7 +735,7 @@ func TestUnprepareResources(t *testing.T) { return // PrepareResources returned an error so stopping the test case here } - assert.NoError(t, err) + require.NoError(t, err) if test.wantResourceSkipped { return // resource skipped so no need to continue @@ -859,7 +859,7 @@ func TestGetContainerClaimInfos(t *testing.T) { return } - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, claimInfos, 1) assert.Equal(t, test.expectedClaimName, claimInfos[0].ClaimInfoState.ClaimName) }) diff --git a/pkg/kubelet/cm/dra/plugin/plugin_test.go b/pkg/kubelet/cm/dra/plugin/plugin_test.go index 12219e06517..a1be8bb845e 100644 --- a/pkg/kubelet/cm/dra/plugin/plugin_test.go +++ b/pkg/kubelet/cm/dra/plugin/plugin_test.go @@ -223,7 +223,7 @@ func TestNewDRAPluginClient(t *testing.T) { assert.Error(t, err) } else { assert.NotNil(t, client) - assert.Nil(t, err) + assert.NoError(t, err) } }) }