Fix density test

test/e2e/density.go

@@ -212,83 +212,76 @@ var _ = Describe("Density", func() {
 
 	type Density struct {
 		skip          bool
-		totalPods     int
 		podsPerMinion int
-		rcsPerThread  int
 	}
 
-	//This test should always run, even if larger densities are skipped.
-	d3 := Density{totalPods: 3, podsPerMinion: 0, rcsPerThread: 1, skip: false}
-
-	//These tests are varied and customizable.
-	//TODO (wojtek-t):don't skip d30 after #6059
-	d30 := Density{totalPods: 30, podsPerMinion: 0, rcsPerThread: 1, skip: true}
-	d50 := Density{totalPods: 50, podsPerMinion: 0, rcsPerThread: 1, skip: true}
-	d100 := Density{totalPods: 100, podsPerMinion: 0, rcsPerThread: 1, skip: true}
-	d500t5 := Density{totalPods: 500, podsPerMinion: 10, rcsPerThread: 5, skip: true}
-	d500t25 := Density{totalPods: 500, podsPerMinion: 10, rcsPerThread: 25, skip: true}
+	densityTests := []Density{
+		// This test should always run, even if larger densities are skipped.
+		{podsPerMinion: 3, skip: false},
+		// TODO (wojtek-t):don't skip d30 after #6059
+		{podsPerMinion: 30, skip: true},
+		{podsPerMinion: 50, skip: true},
+		{podsPerMinion: 100, skip: true},
+	}
 
-	dtests := []Density{d3, d30, d50, d100, d500t5, d500t25}
+	for _, testArg := range densityTests {
+		name := fmt.Sprintf("should allow starting %d pods per node", testArg.podsPerMinion)
+		if testArg.skip {
+			name = "[Skipped] " + name
+		}
+		itArg := testArg
+		It(name, func() {
+			totalPods := itArg.podsPerMinion * minionCount
+			RCName = "my-hostname-density" + strconv.Itoa(totalPods) + "-" + string(util.NewUUID())
+			RunRC(c, RCName, ns, "gcr.io/google_containers/pause:go", totalPods)
+		})
+	}
 
-	//Run each test in the array which isn't skipped.
-	for i := range dtests {
+	type Scalability struct {
+		skip          bool
+		totalPods     int
+		podsPerMinion int
+		rcsPerThread  int
+	}
 
-		//cannot do a range iterator over structs.
-		dtest := dtests[i]
+	scalabilityTests := []Scalability{
+		{totalPods: 500, podsPerMinion: 10, rcsPerThread: 5, skip: true},
+		{totalPods: 500, podsPerMinion: 10, rcsPerThread: 25, skip: true},
+	}
 
-		//if ppm==0, its a raw density test.
-		//otherwise, we continue launching n nodes per pod in threads till we meet the totalPods #.
-		if dtest.podsPerMinion == 0 {
-			//basic density tests
-			name := fmt.Sprintf("should allow starting %d pods per node", dtest.totalPods)
+	for _, testArg := range scalabilityTests {
+		// # of threads calibrate to totalPods
+		threads := (testArg.totalPods / (testArg.podsPerMinion * testArg.rcsPerThread))
 
-			if dtest.skip {
-				name = "[Skipped] " + name
-			}
-			It(name, func() {
-				glog.Info("Density test parameters: %v", dtest)
-				RCName = "my-hostname-density" + strconv.Itoa(dtest.totalPods) + "-" + string(util.NewUUID())
-				RunRC(c, RCName, ns, "gcr.io/google_containers/pause:go", dtest.totalPods)
-			})
-		} else {
-			// # of threads calibrate to totalPods
-			threads := (dtest.totalPods / (dtest.podsPerMinion * dtest.rcsPerThread))
-
-			name := fmt.Sprintf(
-				"[Skipped] should be able to launch %v pods, %v per minion, in %v rcs/thread.",
-				dtest.totalPods, dtest.podsPerMinion, dtest.rcsPerThread)
-
-			if dtest.skip {
-				name = "[Skipped] " + name
-			}
+		name := fmt.Sprintf(
+			"should be able to launch %v pods, %v per minion, in %v rcs/thread.",
+			testArg.totalPods, testArg.podsPerMinion, testArg.rcsPerThread)
+		if testArg.skip {
+			name = "[Skipped] " + name
+		}
 
+		itArg := testArg
+		It(name, func() {
 			podsLaunched := 0
-			It(name, func() {
-
-				var wg sync.WaitGroup
-
-				//count down latch.., once all threads are launched, we wait for
-				//it to decrement down to zero.
-				wg.Add(threads)
-
-				//create queue of pending requests on the api server.
-				for i := 0; i < threads; i++ {
-					go func() {
-						// call to wg.Done will serve as a count down latch.
-						defer wg.Done()
-						for i := 0; i < dtest.rcsPerThread; i++ {
-							name := "my-short-lived-pod" + string(util.NewUUID())
-							n := dtest.podsPerMinion * minionCount
-							RunRC(c, name, ns, "gcr.io/google_containers/pause:go", n)
-							podsLaunched += n
-							glog.Info("Launched %v pods so far...", podsLaunched)
-						}
-					}()
-				}
-				//Wait for all the pods from all the RC's to return.
-				wg.Wait()
-				glog.Info("%v pods out of %v launched", podsLaunched, dtest.totalPods)
-			})
-		}
+			var wg sync.WaitGroup
+			wg.Add(threads)
+
+			// Create queue of pending requests on the api server.
+			for i := 0; i < threads; i++ {
+				go func() {
+					defer wg.Done()
+					for i := 0; i < itArg.rcsPerThread; i++ {
+						name := "my-short-lived-pod" + string(util.NewUUID())
+						n := itArg.podsPerMinion * minionCount
+						RunRC(c, name, ns, "gcr.io/google_containers/pause:go", n)
+						podsLaunched += n
+						glog.Info("Launched %v pods so far...", podsLaunched)
+					}
+				}()
+			}
+			// Wait for all the pods from all the RC's to return.
+			wg.Wait()
+			glog.Info("%v pods out of %v launched", podsLaunched, itArg.totalPods)
+		})
 	}
 })