From 5317a2e2acbb0c72c99a0cea069c47d3f91bf27b Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Mon, 22 Nov 2021 18:17:39 +0000 Subject: [PATCH] Fix error handling in CPUManager distribute NUMA tests Signed-off-by: Kevin Klues --- pkg/kubelet/cm/cpumanager/cpu_assignment_test.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/cm/cpumanager/cpu_assignment_test.go b/pkg/kubelet/cm/cpumanager/cpu_assignment_test.go index b1cb9f7878a..98c6ae9e41d 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_assignment_test.go +++ b/pkg/kubelet/cm/cpumanager/cpu_assignment_test.go @@ -841,8 +841,14 @@ func TestTakeByTopologyNUMADistributed(t *testing.T) { for _, tc := range testCases { t.Run(tc.description, func(t *testing.T) { result, err := takeByTopologyNUMADistributed(tc.topo, tc.availableCPUs, tc.numCPUs, tc.cpuGroupSize) - if tc.expErr != "" && err.Error() != tc.expErr { - t.Errorf("expected error to be [%v] but it was [%v]", tc.expErr, err) + if err != nil { + if tc.expErr == "" { + t.Errorf("unexpected error [%v]", err) + } + if tc.expErr != "" && err.Error() != tc.expErr { + t.Errorf("expected error to be [%v] but it was [%v]", tc.expErr, err) + } + return } if !result.Equals(tc.expResult) { t.Errorf("expected result [%s] to equal [%s]", result, tc.expResult)