Merge pull request #27006 from caesarxuchao/shorten-gc-stress-test

Automatic merge from submit-queue

shorten gc stress test

But the stress test is still run twice, because the `KUBE_TEST_API_VERSIONS` env var in test-integration.sh doesn't have any effect on the testapi because of the [defaulting](https://github.com/kubernetes/kubernetes/blob/master/pkg/api/testapi/testapi.go#L164).

cc @lavalamp
pull/6/head
k8s-merge-robot 2016-06-08 08:50:17 -07:00
commit 46f167188a
1 changed files with 4 additions and 2 deletions

View File

@ -346,7 +346,9 @@ func verifyRemainingObjects(t *testing.T, clientSet clientset.Interface, rcNum,
return ret, nil return ret, nil
} }
// This stress test the garbage collector // The stress test is not very stressful, because we need to control the running
// time of our pre-submit tests to increase submit-queue throughput. We'll add
// e2e tests that put more stress.
func TestStressingCascadingDeletion(t *testing.T) { func TestStressingCascadingDeletion(t *testing.T) {
t.Logf("starts garbage collector stress test") t.Logf("starts garbage collector stress test")
gc, clientSet := setup(t) gc, clientSet := setup(t)
@ -357,7 +359,7 @@ func TestStressingCascadingDeletion(t *testing.T) {
go gc.Run(5, stopCh) go gc.Run(5, stopCh)
defer close(stopCh) defer close(stopCh)
const collections = 30 const collections = 10
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(collections * 4) wg.Add(collections * 4)
rcUIDs := make(chan types.UID, collections*4) rcUIDs := make(chan types.UID, collections*4)