From a07510fade8813a44a2bc915ac1aa14f15582f13 Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Thu, 30 Jan 2025 09:31:37 +0100 Subject: [PATCH] node: cpumgr: test: abort on failure abort the test in the unlikely case we fail to create the Policy object. Exactly because this is unlikely we should fail loudly. In my case this happened because unrelated bad parameters, which was hard to catch Signed-off-by: Francesco Romani --- .../cm/cpumanager/policy_static_test.go | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/pkg/kubelet/cm/cpumanager/policy_static_test.go b/pkg/kubelet/cm/cpumanager/policy_static_test.go index e21136e8f61..8020e78bc5d 100644 --- a/pkg/kubelet/cm/cpumanager/policy_static_test.go +++ b/pkg/kubelet/cm/cpumanager/policy_static_test.go @@ -70,7 +70,10 @@ func (spt staticPolicyTest) PseudoClone() staticPolicyTest { } func TestStaticPolicyName(t *testing.T) { - policy, _ := NewStaticPolicy(topoSingleSocketHT, 1, cpuset.New(), topologymanager.NewFakeManager(), nil) + policy, err := NewStaticPolicy(topoSingleSocketHT, 1, cpuset.New(), topologymanager.NewFakeManager(), nil) + if err != nil { + t.Fatalf("NewStaticPolicy() failed: %v", err) + } policyName := policy.Name() if policyName != "static" { @@ -168,13 +171,16 @@ func TestStaticPolicyStart(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.description, func(t *testing.T) { featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.CPUManagerPolicyAlphaOptions, true) - p, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), testCase.options) + p, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), testCase.options) + if err != nil { + t.Fatalf("NewStaticPolicy() failed: %v", err) + } policy := p.(*staticPolicy) st := &mockState{ assignments: testCase.stAssignments, defaultCPUSet: testCase.stDefaultCPUSet, } - err := policy.Start(st) + err = policy.Start(st) if !reflect.DeepEqual(err, testCase.expErr) { t.Errorf("StaticPolicy Start() error (%v). expected error: %v but got: %v", testCase.description, testCase.expErr, err) @@ -637,7 +643,10 @@ func runStaticPolicyTestCase(t *testing.T, testCase staticPolicyTest) { if testCase.reservedCPUs != nil { cpus = testCase.reservedCPUs.Clone() } - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpus, tm, testCase.options) + policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpus, tm, testCase.options) + if err != nil { + t.Fatalf("NewStaticPolicy() failed: %v", err) + } st := &mockState{ assignments: testCase.stAssignments, @@ -645,7 +654,7 @@ func runStaticPolicyTestCase(t *testing.T, testCase staticPolicyTest) { } container := &testCase.pod.Spec.Containers[0] - err := policy.Allocate(st, testCase.pod, container) + err = policy.Allocate(st, testCase.pod, container) if !reflect.DeepEqual(err, testCase.expErr) { t.Errorf("StaticPolicy Allocate() error (%v). expected add error: %q but got: %q", testCase.description, testCase.expErr, err) @@ -708,7 +717,10 @@ func TestStaticPolicyReuseCPUs(t *testing.T) { } for _, testCase := range testCases { - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil) + policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil) + if err != nil { + t.Fatalf("NewStaticPolicy() failed: %v", err) + } st := &mockState{ assignments: testCase.stAssignments, @@ -761,7 +773,10 @@ func TestStaticPolicyDoNotReuseCPUs(t *testing.T) { } for _, testCase := range testCases { - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil) + policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil) + if err != nil { + t.Fatalf("NewStaticPolicy() failed: %v", err) + } st := &mockState{ assignments: testCase.stAssignments, @@ -843,7 +858,10 @@ func TestStaticPolicyRemove(t *testing.T) { } for _, testCase := range testCases { - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil) + policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil) + if err != nil { + t.Fatalf("NewStaticPolicy() failed: %v", err) + } st := &mockState{ assignments: testCase.stAssignments, @@ -933,13 +951,16 @@ func TestTopologyAwareAllocateCPUs(t *testing.T) { }, } for _, tc := range testCases { - p, _ := NewStaticPolicy(tc.topo, 0, cpuset.New(), topologymanager.NewFakeManager(), nil) + p, err := NewStaticPolicy(tc.topo, 0, cpuset.New(), topologymanager.NewFakeManager(), nil) + if err != nil { + t.Fatalf("NewStaticPolicy() failed: %v", err) + } policy := p.(*staticPolicy) st := &mockState{ assignments: tc.stAssignments, defaultCPUSet: tc.stDefaultCPUSet, } - err := policy.Start(st) + err = policy.Start(st) if err != nil { t.Errorf("StaticPolicy Start() error (%v)", err) continue @@ -1107,7 +1128,10 @@ func TestStaticPolicyAddWithResvList(t *testing.T) { } for _, testCase := range testCases { - policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager(), nil) + policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager(), nil) + if err != nil { + t.Fatalf("NewStaticPolicy() failed: %v", err) + } st := &mockState{ assignments: testCase.stAssignments, @@ -1115,7 +1139,7 @@ func TestStaticPolicyAddWithResvList(t *testing.T) { } container := &testCase.pod.Spec.Containers[0] - err := policy.Allocate(st, testCase.pod, container) + err = policy.Allocate(st, testCase.pod, container) if !reflect.DeepEqual(err, testCase.expErr) { t.Errorf("StaticPolicy Allocate() error (%v). expected add error: %v but got: %v", testCase.description, testCase.expErr, err)