github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5966 from lavalamp/fix2

Browse Source 
Change the way the density test is disabled
This commit is contained in:
David Oppenheimer 2015-03-25 17:37:18 -07:00
commit a34f39aee4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/density.go
View File

@ -166,11 +166,11 @@ func RunRC(c *client.Client, name string, ns, image string, replicas int) {
Expect(current).To(Equal(replicas)) Expect(current).To(Equal(replicas))
} }
// This test suite can take a long time to run, so by default it is disabled // This test suite can take a long time to run, so by default it is added to
// by being marked as Pending. To enable this suite, remove the P from the // the ginkgo.skip list (see driver.go).
// front of PDescribe (PDescribe->Describe) and then all tests will // To run this suite you must explicitly ask for it by setting the
// be available // -t/--test flag or ginkgo.focus flag.
var _ = PDescribe("Density", func() { var _ = Describe("Density", func() {
var c *client.Client var c *client.Client
var minionCount int var minionCount int
var RCName string var RCName string

5
test/e2e/driver.go
View File

@ -70,6 +70,11 @@ func RunE2ETests(kubeConfig, authConfig, certDir, host, repoRoot, provider strin
config.GinkgoConfig.FocusString = `\b(` + strings.Join(testRegexps, "|") + `)\b` config.GinkgoConfig.FocusString = `\b(` + strings.Join(testRegexps, "|") + `)\b`
} }
// Disable density test unless it's explicitly requested.
if config.GinkgoConfig.FocusString == "" && config.GinkgoConfig.SkipString == "" {
config.GinkgoConfig.SkipString = "Density"
}
// TODO: Make orderseed work again. // TODO: Make orderseed work again.
var passed testResult = true var passed testResult = true