github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

registries: simplify deepcopy calls

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-08-15 14:14:49 +02:00
parent 3537f8fa34
commit 4df0eec4df
14 changed files with 202 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/registry/core/replicationcontroller/strategy_test.go
View File

@@ -186,14 +186,8 @@ func TestValidateUpdate(t *testing.T) {
oldController.Annotations[api.NonConvertibleAnnotationPrefix+"/"+"spec.selector"] = "no way"
// Deep-copy so we won't mutate both selectors.
objCopy, err := api.Scheme.DeepCopy(oldController)
if err != nil {
t.Fatalf("unexpected deep-copy error: %v", err)
}
newController, ok := objCopy.(*api.ReplicationController)
if !ok {
t.Fatalf("unexpected object: %#v", objCopy)
}
newController := oldController.DeepCopy()
// Irrelevant (to the selector) update for the replication controller.
newController.Spec.Replicas = 5

20
pkg/registry/core/service/rest_test.go
View File

@@ -76,14 +76,6 @@ func makeIPNet(t *testing.T) *net.IPNet {
return net
}
func deepCloneService(svc *api.Service) *api.Service {
value, err := api.Scheme.DeepCopy(svc)
if err != nil {
panic("couldn't copy service")
}
return value.(*api.Service)
}
func TestServiceRegistryCreate(t *testing.T) {
storage, registry := NewTestREST(t, nil)
@@ -505,14 +497,14 @@ func TestServiceRegistryUpdateExternalService(t *testing.T) {
}
// Modify load balancer to be external.
svc2 := deepCloneService(svc1)
svc2 := svc1.DeepCopy()
svc2.Spec.Type = api.ServiceTypeLoadBalancer
if _, _, err := storage.Update(ctx, svc2.Name, rest.DefaultUpdatedObjectInfo(svc2, api.Scheme)); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
// Change port.
svc3 := deepCloneService(svc2)
svc3 := svc2.DeepCopy()
svc3.Spec.Ports[0].Port = 6504
if _, _, err := storage.Update(ctx, svc3.Name, rest.DefaultUpdatedObjectInfo(svc3, api.Scheme)); err != nil {
t.Fatalf("Unexpected error: %v", err)
@@ -548,7 +540,7 @@ func TestServiceRegistryUpdateMultiPortExternalService(t *testing.T) {
}
// Modify ports
svc2 := deepCloneService(svc1)
svc2 := svc1.DeepCopy()
svc2.Spec.Ports[1].Port = 8088
if _, _, err := storage.Update(ctx, svc2.Name, rest.DefaultUpdatedObjectInfo(svc2, api.Scheme)); err != nil {
t.Fatalf("Unexpected error: %v", err)
@@ -886,7 +878,7 @@ func TestServiceRegistryIPUpdate(t *testing.T) {
t.Errorf("Unexpected ClusterIP: %s", created_service.Spec.ClusterIP)
}
update := deepCloneService(created_service)
update := created_service.DeepCopy()
update.Spec.Ports[0].Port = 6503
updated_svc, _, _ := storage.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(update, api.Scheme))
@@ -904,7 +896,7 @@ func TestServiceRegistryIPUpdate(t *testing.T) {
}
}
update = deepCloneService(created_service)
update = created_service.DeepCopy()
update.Spec.Ports[0].Port = 6503
update.Spec.ClusterIP = testIP // Error: Cluster IP is immutable
@@ -940,7 +932,7 @@ func TestServiceRegistryIPLoadBalancer(t *testing.T) {
t.Errorf("Unexpected ClusterIP: %s", created_service.Spec.ClusterIP)
}
update := deepCloneService(created_service)
update := created_service.DeepCopy()
_, _, err := storage.Update(ctx, update.Name, rest.DefaultUpdatedObjectInfo(update, api.Scheme))
if err != nil {