Move some tests to use go sub-test

2017-12-02 12:47:31 +05:30
parent 8c1ee761d2
commit 623d7c42ac
3 changed files with 104 additions and 96 deletions
--- a/pkg/controller/deployment/sync_test.go
+++ b/pkg/controller/deployment/sync_test.go
@@ -267,72 +267,74 @@ func TestScale(t *testing.T) {
 	}

 	for _, test := range tests {
-		_ = olderTimestamp
-		t.Log(test.name)
-		fake := fake.Clientset{}
-		dc := &DeploymentController{
-			client:        &fake,
-			eventRecorder: &record.FakeRecorder{},
-		}
-
-		if test.newRS != nil {
-			desiredReplicas := *(test.oldDeployment.Spec.Replicas)
-			if desired, ok := test.desiredReplicasAnnotations[test.newRS.Name]; ok {
-				desiredReplicas = desired
+		t.Run(test.name, func(t *testing.T) {
+			_ = olderTimestamp
+			t.Log(test.name)
+			fake := fake.Clientset{}
+			dc := &DeploymentController{
+				client:        &fake,
+				eventRecorder: &record.FakeRecorder{},
 			}
-			deploymentutil.SetReplicasAnnotations(test.newRS, desiredReplicas, desiredReplicas+deploymentutil.MaxSurge(*test.oldDeployment))
-		}
-		for i := range test.oldRSs {
-			rs := test.oldRSs[i]
-			if rs == nil {
-				continue
-			}
-			desiredReplicas := *(test.oldDeployment.Spec.Replicas)
-			if desired, ok := test.desiredReplicasAnnotations[rs.Name]; ok {
-				desiredReplicas = desired
-			}
-			deploymentutil.SetReplicasAnnotations(rs, desiredReplicas, desiredReplicas+deploymentutil.MaxSurge(*test.oldDeployment))
-		}

-		if err := dc.scale(test.deployment, test.newRS, test.oldRSs); err != nil {
-			t.Errorf("%s: unexpected error: %v", test.name, err)
-			continue
-		}
+			if test.newRS != nil {
+				desiredReplicas := *(test.oldDeployment.Spec.Replicas)
+				if desired, ok := test.desiredReplicasAnnotations[test.newRS.Name]; ok {
+					desiredReplicas = desired
+				}
+				deploymentutil.SetReplicasAnnotations(test.newRS, desiredReplicas, desiredReplicas+deploymentutil.MaxSurge(*test.oldDeployment))
+			}
+			for i := range test.oldRSs {
+				rs := test.oldRSs[i]
+				if rs == nil {
+					continue
+				}
+				desiredReplicas := *(test.oldDeployment.Spec.Replicas)
+				if desired, ok := test.desiredReplicasAnnotations[rs.Name]; ok {
+					desiredReplicas = desired
+				}
+				deploymentutil.SetReplicasAnnotations(rs, desiredReplicas, desiredReplicas+deploymentutil.MaxSurge(*test.oldDeployment))
+			}

-		// Construct the nameToSize map that will hold all the sizes we got our of tests
-		// Skip updating the map if the replica set wasn't updated since there will be
-		// no update action for it.
-		nameToSize := make(map[string]int32)
-		if test.newRS != nil {
-			nameToSize[test.newRS.Name] = *(test.newRS.Spec.Replicas)
-		}
-		for i := range test.oldRSs {
-			rs := test.oldRSs[i]
-			nameToSize[rs.Name] = *(rs.Spec.Replicas)
-		}
-		// Get all the UPDATE actions and update nameToSize with all the updated sizes.
-		for _, action := range fake.Actions() {
-			rs := action.(testclient.UpdateAction).GetObject().(*extensions.ReplicaSet)
-			if !test.wasntUpdated[rs.Name] {
+			if err := dc.scale(test.deployment, test.newRS, test.oldRSs); err != nil {
+				t.Errorf("%s: unexpected error: %v", test.name, err)
+				return
+			}
+
+			// Construct the nameToSize map that will hold all the sizes we got our of tests
+			// Skip updating the map if the replica set wasn't updated since there will be
+			// no update action for it.
+			nameToSize := make(map[string]int32)
+			if test.newRS != nil {
+				nameToSize[test.newRS.Name] = *(test.newRS.Spec.Replicas)
+			}
+			for i := range test.oldRSs {
+				rs := test.oldRSs[i]
 				nameToSize[rs.Name] = *(rs.Spec.Replicas)
 			}
-		}
-
-		if test.expectedNew != nil && test.newRS != nil && *(test.expectedNew.Spec.Replicas) != nameToSize[test.newRS.Name] {
-			t.Errorf("%s: expected new replicas: %d, got: %d", test.name, *(test.expectedNew.Spec.Replicas), nameToSize[test.newRS.Name])
-			continue
-		}
-		if len(test.expectedOld) != len(test.oldRSs) {
-			t.Errorf("%s: expected %d old replica sets, got %d", test.name, len(test.expectedOld), len(test.oldRSs))
-			continue
-		}
-		for n := range test.oldRSs {
-			rs := test.oldRSs[n]
-			expected := test.expectedOld[n]
-			if *(expected.Spec.Replicas) != nameToSize[rs.Name] {
-				t.Errorf("%s: expected old (%s) replicas: %d, got: %d", test.name, rs.Name, *(expected.Spec.Replicas), nameToSize[rs.Name])
+			// Get all the UPDATE actions and update nameToSize with all the updated sizes.
+			for _, action := range fake.Actions() {
+				rs := action.(testclient.UpdateAction).GetObject().(*extensions.ReplicaSet)
+				if !test.wasntUpdated[rs.Name] {
+					nameToSize[rs.Name] = *(rs.Spec.Replicas)
+				}
 			}
-		}
+
+			if test.expectedNew != nil && test.newRS != nil && *(test.expectedNew.Spec.Replicas) != nameToSize[test.newRS.Name] {
+				t.Errorf("%s: expected new replicas: %d, got: %d", test.name, *(test.expectedNew.Spec.Replicas), nameToSize[test.newRS.Name])
+				return
+			}
+			if len(test.expectedOld) != len(test.oldRSs) {
+				t.Errorf("%s: expected %d old replica sets, got %d", test.name, len(test.expectedOld), len(test.oldRSs))
+				return
+			}
+			for n := range test.oldRSs {
+				rs := test.oldRSs[n]
+				expected := test.expectedOld[n]
+				if *(expected.Spec.Replicas) != nameToSize[rs.Name] {
+					t.Errorf("%s: expected old (%s) replicas: %d, got: %d", test.name, rs.Name, *(expected.Spec.Replicas), nameToSize[rs.Name])
+				}
+			}
+		})
 	}
 }