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 #13810 from quinton-hoole/2015-09-10-banish-flaky-tests

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-12 21:10:49 -07:00
commit 4aa412e04d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/jenkins/e2e.sh
View File

@ -149,6 +149,7 @@ GCE_PARALLEL_SKIP_TESTS=(
GCE_PARALLEL_FLAKY_TESTS=( GCE_PARALLEL_FLAKY_TESTS=(
"DaemonRestart" "DaemonRestart"
"Elasticsearch" "Elasticsearch"
"Namespaces.*should\sdelete\sfast"
"PD" "PD"
"ServiceAccounts" "ServiceAccounts"
"Services.*change\sthe\stype" "Services.*change\sthe\stype"

11
test/e2e/namespace.go
View File

@ -19,13 +19,14 @@ package e2e
import ( import (
"fmt" "fmt"
//"k8s.io/kubernetes/pkg/api" //"k8s.io/kubernetes/pkg/api"
"strings"
"sync"
"time"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"strings"
"sync"
"time"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
@ -110,10 +111,10 @@ var _ = Describe("Namespaces", func() {
//Confirms that namespace draining is functioning reasonably //Confirms that namespace draining is functioning reasonably
//at minute intervals. //at minute intervals.
It("Delete 90 percent of 100 namespace in 150 seconds", It("should delete fast enough (90 percent of 100 namespaces in 150 seconds)",
func() { extinguish(c, 100, 10, 150) }) func() { extinguish(c, 100, 10, 150) })
//comprehensive draining ; uncomment after #7372 //comprehensive draining ; uncomment after #7372
PIt("Delete ALL of 100 namespace in 150 seconds", PIt("should always delete fast (ALL of 100 namespaces in 150 seconds)",
func() { extinguish(c, 100, 0, 150) }) func() { extinguish(c, 100, 0, 150) })
}) })