github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Service REST test: Remove pointless cleanup

Browse Source
This commit is contained in:
Tim Hockin 2021-07-01 23:20:10 -07:00
parent ca708fa9ac
commit 2b84b49ea9
1 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkg/registry/core/service/storage/rest_test.go
View File

@ -278,26 +278,6 @@ func portIsAllocated(t *testing.T, alloc portallocator.Interface, port int32) bo
return alloc.Has(int(port)) return alloc.Has(int(port))
} }
func releaseServiceNodePorts(t *testing.T, ctx context.Context, svcName string, rest *REST) {
t.Helper()
obj, err := rest.Get(ctx, svcName, &metav1.GetOptions{})
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
srv := obj.(*api.Service)
if srv == nil {
t.Fatalf("Failed to find service: %s", svcName)
}
serviceNodePorts := collectServiceNodePorts(srv)
if len(serviceNodePorts) == 0 {
t.Fatalf("Failed to find NodePorts of service : %s", srv.Name)
}
for i := range serviceNodePorts {
nodePort := serviceNodePorts[i]
rest.serviceNodePorts.Release(nodePort)
}
}
func TestServiceRegistryCreate(t *testing.T) { func TestServiceRegistryCreate(t *testing.T) {
testCases := []struct { testCases := []struct {
svc *api.Service svc *api.Service
@ -772,11 +752,6 @@ func TestServiceRegistryLoadBalancerService(t *testing.T) {
if len(serviceNodePorts) == 0 { if len(serviceNodePorts) == 0 {
t.Errorf("Failed to find NodePorts of service : %s", srv.Name) t.Errorf("Failed to find NodePorts of service : %s", srv.Name)
} }
for i := range serviceNodePorts {
nodePort := serviceNodePorts[i]
// Release the node port at the end of the test case.
storage.serviceNodePorts.Release(nodePort)
}
} }
func TestAllocateLoadBalancerNodePorts(t *testing.T) { func TestAllocateLoadBalancerNodePorts(t *testing.T) {
@ -844,12 +819,6 @@ func TestAllocateLoadBalancerNodePorts(t *testing.T) {
if (len(serviceNodePorts) != 0) != tc.expectNodePorts { if (len(serviceNodePorts) != 0) != tc.expectNodePorts {
t.Errorf("%s; Allocated NodePorts not as expected", tc.name) t.Errorf("%s; Allocated NodePorts not as expected", tc.name)
} }
for i := range serviceNodePorts {
nodePort := serviceNodePorts[i]
// Release the node port at the end of the test case.
storage.serviceNodePorts.Release(nodePort)
}
}) })
} }
} }
@ -982,7 +951,6 @@ func TestServiceRegistryUpdateLoadBalancerService(t *testing.T) {
if _, _, err := storage.Update(ctx, svc2.Name, rest.DefaultUpdatedObjectInfo(svc2), rest.ValidateAllObjectFunc, rest.ValidateAllObjectUpdateFunc, false, &metav1.UpdateOptions{}); err != nil { if _, _, err := storage.Update(ctx, svc2.Name, rest.DefaultUpdatedObjectInfo(svc2), rest.ValidateAllObjectFunc, rest.ValidateAllObjectUpdateFunc, false, &metav1.UpdateOptions{}); err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
defer releaseServiceNodePorts(t, ctx, svc2.Name, storage)
// Change port. // Change port.
svc3 := svc2.DeepCopy() svc3 := svc2.DeepCopy()
@ -1007,7 +975,6 @@ func TestServiceRegistryUpdateMultiPortLoadBalancerService(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
defer releaseServiceNodePorts(t, ctx, svc1.Name, storage)
// Modify ports // Modify ports
svc2 := obj.(*api.Service).DeepCopy() svc2 := obj.(*api.Service).DeepCopy()
@ -1363,7 +1330,6 @@ func TestServiceRegistryIPLoadBalancer(t *testing.T) {
if createdSvc == nil || err != nil { if createdSvc == nil || err != nil {
t.Errorf("Unexpected failure creating service %v", err) t.Errorf("Unexpected failure creating service %v", err)
} }
defer releaseServiceNodePorts(t, ctx, svc.Name, storage)
createdService := createdSvc.(*api.Service) createdService := createdSvc.(*api.Service)
if createdService.Spec.Ports[0].Port != svc.Spec.Ports[0].Port { if createdService.Spec.Ports[0].Port != svc.Spec.Ports[0].Port {
@ -1394,7 +1360,6 @@ func TestServiceRegistryExternalTrafficHealthCheckNodePortAllocation(t *testing.
if obj == nil || err != nil { if obj == nil || err != nil {
t.Errorf("Unexpected failure creating service %v", err) t.Errorf("Unexpected failure creating service %v", err)
} }
defer releaseServiceNodePorts(t, ctx, svc.Name, storage)
createdSvc := obj.(*api.Service) createdSvc := obj.(*api.Service)
if !service.NeedsHealthCheck(createdSvc) { if !service.NeedsHealthCheck(createdSvc) {
@ -1403,9 +1368,6 @@ func TestServiceRegistryExternalTrafficHealthCheckNodePortAllocation(t *testing.
port := createdSvc.Spec.HealthCheckNodePort port := createdSvc.Spec.HealthCheckNodePort
if port == 0 { if port == 0 {
t.Errorf("Failed to allocate health check node port and set the HealthCheckNodePort") t.Errorf("Failed to allocate health check node port and set the HealthCheckNodePort")
} else {
// Release the health check node port at the end of the test case.
storage.serviceNodePorts.Release(int(port))
} }
} }
@ -1426,7 +1388,6 @@ func TestServiceRegistryExternalTrafficHealthCheckNodePortUserAllocation(t *test
if obj == nil || err != nil { if obj == nil || err != nil {
t.Fatalf("Unexpected failure creating service :%v", err) t.Fatalf("Unexpected failure creating service :%v", err)
} }
defer releaseServiceNodePorts(t, ctx, svc.Name, storage)
createdSvc := obj.(*api.Service) createdSvc := obj.(*api.Service)
if !service.NeedsHealthCheck(createdSvc) { if !service.NeedsHealthCheck(createdSvc) {
@ -1439,10 +1400,6 @@ func TestServiceRegistryExternalTrafficHealthCheckNodePortUserAllocation(t *test
if port != 30501 { if port != 30501 {
t.Errorf("Failed to allocate requested nodePort expected %d, got %d", 30501, port) t.Errorf("Failed to allocate requested nodePort expected %d, got %d", 30501, port)
} }
if port != 0 {
// Release the health check node port at the end of the test case.
storage.serviceNodePorts.Release(int(port))
}
} }
// Validate that the service creation fails when the requested port number is -1. // Validate that the service creation fails when the requested port number is -1.
@ -1473,7 +1430,6 @@ func TestServiceRegistryExternalTrafficGlobal(t *testing.T) {
if obj == nil || err != nil { if obj == nil || err != nil {
t.Errorf("Unexpected failure creating service %v", err) t.Errorf("Unexpected failure creating service %v", err)
} }
defer releaseServiceNodePorts(t, ctx, svc.Name, storage)
createdSvc := obj.(*api.Service) createdSvc := obj.(*api.Service)
if service.NeedsHealthCheck(createdSvc) { if service.NeedsHealthCheck(createdSvc) {
@ -1482,8 +1438,6 @@ func TestServiceRegistryExternalTrafficGlobal(t *testing.T) {
// Make sure the service does not have the health check node port allocated // Make sure the service does not have the health check node port allocated
port := createdSvc.Spec.HealthCheckNodePort port := createdSvc.Spec.HealthCheckNodePort
if port != 0 { if port != 0 {
// Release the health check node port at the end of the test case.
storage.serviceNodePorts.Release(int(port))
t.Errorf("Unexpected allocation of health check node port: %v", port) t.Errorf("Unexpected allocation of health check node port: %v", port)
} }
} }
@ -1733,7 +1687,6 @@ func TestInitNodePorts(t *testing.T) {
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
defer server.Terminate(t) defer server.Terminate(t)
nodePortOp := portallocator.StartOperation(storage.serviceNodePorts, false) nodePortOp := portallocator.StartOperation(storage.serviceNodePorts, false)
defer nodePortOp.Finish()
testCases := []struct { testCases := []struct {
name string name string
@ -1818,7 +1771,6 @@ func TestUpdateNodePorts(t *testing.T) {
storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol}) storage, server := NewTestREST(t, []api.IPFamily{api.IPv4Protocol})
defer server.Terminate(t) defer server.Terminate(t)
nodePortOp := portallocator.StartOperation(storage.serviceNodePorts, false) nodePortOp := portallocator.StartOperation(storage.serviceNodePorts, false)
defer nodePortOp.Finish()
testCases := []struct { testCases := []struct {
name string name string