Skip to content

Commit a07510f

Browse files
committed
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 <[email protected]>
1 parent 46aba9d commit a07510f

File tree

1 file changed

+36
-12
lines changed

1 file changed

+36
-12
lines changed

pkg/kubelet/cm/cpumanager/policy_static_test.go

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ func (spt staticPolicyTest) PseudoClone() staticPolicyTest {
7070
}
7171

7272
func TestStaticPolicyName(t *testing.T) {
73-
policy, _ := NewStaticPolicy(topoSingleSocketHT, 1, cpuset.New(), topologymanager.NewFakeManager(), nil)
73+
policy, err := NewStaticPolicy(topoSingleSocketHT, 1, cpuset.New(), topologymanager.NewFakeManager(), nil)
74+
if err != nil {
75+
t.Fatalf("NewStaticPolicy() failed: %v", err)
76+
}
7477

7578
policyName := policy.Name()
7679
if policyName != "static" {
@@ -168,13 +171,16 @@ func TestStaticPolicyStart(t *testing.T) {
168171
for _, testCase := range testCases {
169172
t.Run(testCase.description, func(t *testing.T) {
170173
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.CPUManagerPolicyAlphaOptions, true)
171-
p, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), testCase.options)
174+
p, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), testCase.options)
175+
if err != nil {
176+
t.Fatalf("NewStaticPolicy() failed: %v", err)
177+
}
172178
policy := p.(*staticPolicy)
173179
st := &mockState{
174180
assignments: testCase.stAssignments,
175181
defaultCPUSet: testCase.stDefaultCPUSet,
176182
}
177-
err := policy.Start(st)
183+
err = policy.Start(st)
178184
if !reflect.DeepEqual(err, testCase.expErr) {
179185
t.Errorf("StaticPolicy Start() error (%v). expected error: %v but got: %v",
180186
testCase.description, testCase.expErr, err)
@@ -637,15 +643,18 @@ func runStaticPolicyTestCase(t *testing.T, testCase staticPolicyTest) {
637643
if testCase.reservedCPUs != nil {
638644
cpus = testCase.reservedCPUs.Clone()
639645
}
640-
policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpus, tm, testCase.options)
646+
policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpus, tm, testCase.options)
647+
if err != nil {
648+
t.Fatalf("NewStaticPolicy() failed: %v", err)
649+
}
641650

642651
st := &mockState{
643652
assignments: testCase.stAssignments,
644653
defaultCPUSet: testCase.stDefaultCPUSet,
645654
}
646655

647656
container := &testCase.pod.Spec.Containers[0]
648-
err := policy.Allocate(st, testCase.pod, container)
657+
err = policy.Allocate(st, testCase.pod, container)
649658
if !reflect.DeepEqual(err, testCase.expErr) {
650659
t.Errorf("StaticPolicy Allocate() error (%v). expected add error: %q but got: %q",
651660
testCase.description, testCase.expErr, err)
@@ -708,7 +717,10 @@ func TestStaticPolicyReuseCPUs(t *testing.T) {
708717
}
709718

710719
for _, testCase := range testCases {
711-
policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil)
720+
policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil)
721+
if err != nil {
722+
t.Fatalf("NewStaticPolicy() failed: %v", err)
723+
}
712724

713725
st := &mockState{
714726
assignments: testCase.stAssignments,
@@ -761,7 +773,10 @@ func TestStaticPolicyDoNotReuseCPUs(t *testing.T) {
761773
}
762774

763775
for _, testCase := range testCases {
764-
policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil)
776+
policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil)
777+
if err != nil {
778+
t.Fatalf("NewStaticPolicy() failed: %v", err)
779+
}
765780

766781
st := &mockState{
767782
assignments: testCase.stAssignments,
@@ -843,7 +858,10 @@ func TestStaticPolicyRemove(t *testing.T) {
843858
}
844859

845860
for _, testCase := range testCases {
846-
policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil)
861+
policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, cpuset.New(), topologymanager.NewFakeManager(), nil)
862+
if err != nil {
863+
t.Fatalf("NewStaticPolicy() failed: %v", err)
864+
}
847865

848866
st := &mockState{
849867
assignments: testCase.stAssignments,
@@ -933,13 +951,16 @@ func TestTopologyAwareAllocateCPUs(t *testing.T) {
933951
},
934952
}
935953
for _, tc := range testCases {
936-
p, _ := NewStaticPolicy(tc.topo, 0, cpuset.New(), topologymanager.NewFakeManager(), nil)
954+
p, err := NewStaticPolicy(tc.topo, 0, cpuset.New(), topologymanager.NewFakeManager(), nil)
955+
if err != nil {
956+
t.Fatalf("NewStaticPolicy() failed: %v", err)
957+
}
937958
policy := p.(*staticPolicy)
938959
st := &mockState{
939960
assignments: tc.stAssignments,
940961
defaultCPUSet: tc.stDefaultCPUSet,
941962
}
942-
err := policy.Start(st)
963+
err = policy.Start(st)
943964
if err != nil {
944965
t.Errorf("StaticPolicy Start() error (%v)", err)
945966
continue
@@ -1107,15 +1128,18 @@ func TestStaticPolicyAddWithResvList(t *testing.T) {
11071128
}
11081129

11091130
for _, testCase := range testCases {
1110-
policy, _ := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager(), nil)
1131+
policy, err := NewStaticPolicy(testCase.topo, testCase.numReservedCPUs, testCase.reserved, topologymanager.NewFakeManager(), nil)
1132+
if err != nil {
1133+
t.Fatalf("NewStaticPolicy() failed: %v", err)
1134+
}
11111135

11121136
st := &mockState{
11131137
assignments: testCase.stAssignments,
11141138
defaultCPUSet: testCase.stDefaultCPUSet,
11151139
}
11161140

11171141
container := &testCase.pod.Spec.Containers[0]
1118-
err := policy.Allocate(st, testCase.pod, container)
1142+
err = policy.Allocate(st, testCase.pod, container)
11191143
if !reflect.DeepEqual(err, testCase.expErr) {
11201144
t.Errorf("StaticPolicy Allocate() error (%v). expected add error: %v but got: %v",
11211145
testCase.description, testCase.expErr, err)

0 commit comments

Comments
 (0)