From 01c2c4f35f315eb79f1b9138691e45aba19d65ed Mon Sep 17 00:00:00 2001 From: twelcon Date: Tue, 20 Jun 2023 19:42:17 +0530 Subject: [PATCH] Error test cases added Signed-off-by: twelcon --- pkg/apis/core/validation/validation_test.go | 33 ++++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index e5462f715d0..9a0892112e3 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -6749,10 +6749,13 @@ func TestValidateResizePolicy(t *testing.T) { tSupportedResizeResources := sets.NewString(string(core.ResourceCPU), string(core.ResourceMemory)) tSupportedResizePolicies := sets.NewString(string(core.NotRequired), string(core.RestartContainer)) type T struct { - PolicyList []core.ContainerResizePolicy - ExpectError bool - Errors field.ErrorList + PolicyList []core.ContainerResizePolicy + ExpectError bool + Errors field.ErrorList + PodRestartPolicy core.RestartPolicy } + // var PodRestartPolicy core.RestartPolicy + // PodRestartPolicy = "Never" testCases := map[string]T{ "ValidCPUandMemoryPolicies": { []core.ContainerResizePolicy{ @@ -6761,6 +6764,7 @@ func TestValidateResizePolicy(t *testing.T) { }, false, nil, + "Always", }, "ValidCPUPolicy": { []core.ContainerResizePolicy{ @@ -6768,6 +6772,7 @@ func TestValidateResizePolicy(t *testing.T) { }, false, nil, + "Always", }, "ValidMemoryPolicy": { []core.ContainerResizePolicy{ @@ -6775,11 +6780,13 @@ func TestValidateResizePolicy(t *testing.T) { }, false, nil, + "Always", }, "NoPolicy": { []core.ContainerResizePolicy{}, false, nil, + "Always", }, "ValidCPUandInvalidMemoryPolicy": { []core.ContainerResizePolicy{ @@ -6788,6 +6795,7 @@ func TestValidateResizePolicy(t *testing.T) { }, true, field.ErrorList{field.NotSupported(field.NewPath("field"), core.ResourceResizeRestartPolicy("Restarrrt"), tSupportedResizePolicies.List())}, + "Always", }, "ValidMemoryandInvalidCPUPolicy": { []core.ContainerResizePolicy{ @@ -6796,6 +6804,7 @@ func TestValidateResizePolicy(t *testing.T) { }, true, field.ErrorList{field.NotSupported(field.NewPath("field"), core.ResourceResizeRestartPolicy("RestartNotRequirrred"), tSupportedResizePolicies.List())}, + "Always", }, "InvalidResourceNameValidPolicy": { []core.ContainerResizePolicy{ @@ -6803,6 +6812,7 @@ func TestValidateResizePolicy(t *testing.T) { }, true, field.ErrorList{field.NotSupported(field.NewPath("field"), core.ResourceName("cpuuu"), tSupportedResizeResources.List())}, + "Always", }, "ValidResourceNameMissingPolicy": { []core.ContainerResizePolicy{ @@ -6810,6 +6820,7 @@ func TestValidateResizePolicy(t *testing.T) { }, true, field.ErrorList{field.Required(field.NewPath("field"), "")}, + "Always", }, "RepeatedPolicies": { []core.ContainerResizePolicy{ @@ -6819,12 +6830,20 @@ func TestValidateResizePolicy(t *testing.T) { }, true, field.ErrorList{field.Duplicate(field.NewPath("field").Index(2), core.ResourceCPU)}, + "Always", + }, + "InvalidPolicyWithPodRestartPolicy": { + []core.ContainerResizePolicy{ + {ResourceName: "cpu", RestartPolicy: "NotRequired"}, + {ResourceName: "memory", RestartPolicy: "RestartContainer"}, + }, + true, + field.ErrorList{field.NotSupported(field.NewPath("field"), core.ResourceResizeRestartPolicy("RestartContainer"), []string{string(core.NotRequired)})}, + "Never", }, } - var PodRestartPolicy core.RestartPolicy - PodRestartPolicy = "Never" for k, v := range testCases { - errs := validateResizePolicy(v.PolicyList, field.NewPath("field"), &PodRestartPolicy) + errs := validateResizePolicy(v.PolicyList, field.NewPath("field"), &v.PodRestartPolicy) if !v.ExpectError && len(errs) > 0 { t.Errorf("Testcase %s - expected success, got error: %+v", k, errs) } @@ -7480,7 +7499,7 @@ func TestValidateContainers(t *testing.T) { } var PodRestartPolicy core.RestartPolicy - PodRestartPolicy = "Never" + PodRestartPolicy = "Always" if errs := validateContainers(successCase, volumeDevices, nil, field.NewPath("field"), PodValidationOptions{}, &PodRestartPolicy); len(errs) != 0 { t.Errorf("expected success: %v", errs) }