From a64b9cee2114e5214868d3ccae0ad269ddd9ff94 Mon Sep 17 00:00:00 2001
From: cncal <flycalvin@qq.com>
Date: Fri, 21 Jan 2022 12:53:08 +0800
Subject: [PATCH 1/3] fix test for CheckpointStateRestore

---
 .../cpumanager/state/state_checkpoint_test.go | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
index 7164e716aac..d95b8557da9 100644
--- a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
+++ b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
@@ -225,15 +225,19 @@ func TestCheckpointStateRestore(t *testing.T) {
 			}
 
 			restoredState, err := NewCheckpointState(testingDir, testingCheckpoint, tc.policyName, tc.initialContainers)
-			if err != nil {
-				if strings.TrimSpace(tc.expectedError) != "" {
-					if strings.Contains(err.Error(), "could not restore state from checkpoint") &&
-						strings.Contains(err.Error(), tc.expectedError) {
-						t.Logf("got expected error: %v", err)
-						return
-					}
+			if strings.TrimSpace(tc.expectedError) == "" {
+				if err != nil {
+					t.Fatalf("unexpected error while creating checkpointState: %v", err)
+				}
+			} else {
+				if err == nil {
+					t.Fatalf("expected error: %s, got nil", tc.expectedError)
+				}
+				if strings.Contains(err.Error(), "could not restore state from checkpoint") &&
+					strings.Contains(err.Error(), tc.expectedError) {
+					t.Logf("got expected error: %v", err)
+					return
 				}
-				t.Fatalf("unexpected error while creatng checkpointState: %v", err)
 			}
 
 			// compare state after restoration with the one expected

From fa1d1edbefe747ac1690f534cebbc936eb054001 Mon Sep 17 00:00:00 2001
From: cncal <flycalvin@qq.com>
Date: Sat, 9 Apr 2022 10:45:13 +0800
Subject: [PATCH 2/3] use require to simplify testcases

---
 .../cpumanager/state/state_checkpoint_test.go | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
index d95b8557da9..a19436da4fd 100644
--- a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
+++ b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package state
 
 import (
+	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
 	"reflect"
@@ -201,15 +202,11 @@ func TestCheckpointStateRestore(t *testing.T) {
 
 	// create temp dir
 	testingDir, err := ioutil.TempDir("", "cpumanager_state_test")
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 	defer os.RemoveAll(testingDir)
 	// create checkpoint manager for testing
 	cpm, err := checkpointmanager.NewCheckpointManager(testingDir)
-	if err != nil {
-		t.Fatalf("could not create testing checkpoint manager: %v", err)
-	}
+	require.NoErrorf(t, err, "could not create testing checkpoint manager: %v", err)
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
@@ -219,25 +216,18 @@ func TestCheckpointStateRestore(t *testing.T) {
 			// prepare checkpoint for testing
 			if strings.TrimSpace(tc.checkpointContent) != "" {
 				checkpoint := &testutil.MockCheckpoint{Content: tc.checkpointContent}
-				if err := cpm.CreateCheckpoint(testingCheckpoint, checkpoint); err != nil {
-					t.Fatalf("could not create testing checkpoint: %v", err)
-				}
+				err = cpm.CreateCheckpoint(testingCheckpoint, checkpoint)
+				require.NoErrorf(t, err, "could not create testing checkpoint: %v", err)
 			}
 
 			restoredState, err := NewCheckpointState(testingDir, testingCheckpoint, tc.policyName, tc.initialContainers)
 			if strings.TrimSpace(tc.expectedError) == "" {
-				if err != nil {
-					t.Fatalf("unexpected error while creating checkpointState: %v", err)
-				}
+				require.NoError(t, err)
 			} else {
-				if err == nil {
-					t.Fatalf("expected error: %s, got nil", tc.expectedError)
-				}
-				if strings.Contains(err.Error(), "could not restore state from checkpoint") &&
-					strings.Contains(err.Error(), tc.expectedError) {
-					t.Logf("got expected error: %v", err)
-					return
-				}
+				require.Error(t, err)
+				require.Contains(t, err.Error(), "could not restore state from checkpoint")
+				require.Contains(t, err.Error(), tc.expectedError)
+				return
 			}
 
 			// compare state after restoration with the one expected

From ab945d21adf5eb314cdc0553c2e06788dfcbfe8e Mon Sep 17 00:00:00 2001
From: cncal <flycalvin@qq.com>
Date: Sat, 9 Apr 2022 10:52:48 +0800
Subject: [PATCH 3/3] reorder the import packages

---
 pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
index a19436da4fd..65dc21f5d12 100644
--- a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
+++ b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
@@ -17,13 +17,13 @@ limitations under the License.
 package state
 
 import (
-	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
 	"reflect"
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
 	"k8s.io/kubernetes/pkg/kubelet/cm/containermap"
 	testutil "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state/testing"