github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #30024 from caesarxuchao/fix-29992 

Automatic merge from submit-queue

Fix 29992

Fix #29992.

I copied RC test code to the wrong place to the RS test in #29798. I took a look at the failure reports, they  were all failed on the RS test, so #29798 itself is correct.

Marked as P2 since it fixes a test flake that will block everyone.
pull/6/head
Kubernetes Submit Queue 2016-08-03 18:55:13 -07:00 committed by GitHub
parent b917ca0937 ed091e8fe0
commit 61bcbae578
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/replicaset/replicaset_test.go
View File

@ -316,7 +316,6 @@ func TestUpdateSelectorToAdopt(t *testing.T) {
stopCh := make(chan struct{})
go podInformer.Run(stopCh)
waitToObservePods(t, podInformer, 2)
go rm.Run(5, stopCh)
waitRSStable(t, clientSet, rs, ns.Name)
@ -354,6 +353,7 @@ func TestUpdateSelectorToRemoveControllerRef(t *testing.T) {
stopCh := make(chan struct{})
go podInformer.Run(stopCh)
waitToObservePods(t, podInformer, 2)
go rm.Run(5, stopCh)
waitRSStable(t, clientSet, rs, ns.Name)