From 467f400721cecb7dce117750af2dadc34bd84465 Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Fri, 27 Mar 2015 11:14:54 +0100
Subject: [PATCH] Change Density test to avoid pulling image be the main factor

---
 test/e2e/density.go | 22 ++++++++++++++++------
 test/e2e/driver.go  |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/test/e2e/density.go b/test/e2e/density.go
index 6a2f2d63380..85126e1e8ce 100644
--- a/test/e2e/density.go
+++ b/test/e2e/density.go
@@ -18,6 +18,7 @@ package e2e
 
 import (
 	"fmt"
+	"strconv"
 	"sync"
 	"time"
 
@@ -206,12 +207,21 @@ var _ = Describe("Density", func() {
 		}
 	})
 
-	It("should allow starting 100 pods per node", func() {
-		RCName = "my-hostname-density100-" + string(util.NewUUID())
-		RunRC(c, RCName, ns, "dockerfile/nginx", 100*minionCount)
-	})
+	// Tests with "Skipped" substring in their name will be skipped when running
+	// e2e test suite without --ginkgo.focus & --ginkgo.skip flags.
 
-	It("should have master components that can handle many short-lived pods", func() {
+	for _, count := range []int{30, 50, 100} {
+		name := fmt.Sprintf("should allow starting %d pods per node", count)
+		if count > 30 {
+			name = "[Skipped] " + name
+		}
+		It(name, func() {
+			RCName = "my-hostname-density" + strconv.Itoa(count) + "-" + string(util.NewUUID())
+			RunRC(c, RCName, ns, "kubernetes/pause:go", count*minionCount)
+		})
+	}
+
+	It("[Skipped] should have master components that can handle many short-lived pods", func() {
 		threads := 5
 		var wg sync.WaitGroup
 		wg.Add(threads)
@@ -220,7 +230,7 @@ var _ = Describe("Density", func() {
 				defer wg.Done()
 				for i := 0; i < 10; i++ {
 					name := "my-hostname-thrash-" + string(util.NewUUID())
-					RunRC(c, name, ns, "kubernetes/pause", 10*minionCount)
+					RunRC(c, name, ns, "kubernetes/pause:go", 10*minionCount)
 				}
 			}()
 		}
diff --git a/test/e2e/driver.go b/test/e2e/driver.go
index ccfe027b4f4..e5d0d517a8a 100644
--- a/test/e2e/driver.go
+++ b/test/e2e/driver.go
@@ -72,7 +72,7 @@ func RunE2ETests(kubeConfig, authConfig, certDir, host, repoRoot, provider strin
 
 	// Disable density test unless it's explicitly requested.
 	if config.GinkgoConfig.FocusString == "" && config.GinkgoConfig.SkipString == "" {
-		config.GinkgoConfig.SkipString = "Density"
+		config.GinkgoConfig.SkipString = "Skipped"
 	}
 
 	// TODO: Make orderseed work again.