Skip to content

K
k3s
Commit 61bcbae5 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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.
parents b917ca09 ed091e8f
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
test/integration/replicaset/replicaset_test.go
View file @ 61bcbae5
...@@ -316,7 +316,6 @@ func TestUpdateSelectorToAdopt(t *testing.T) { ...@@ -316,7 +316,6 @@ func TestUpdateSelectorToAdopt(t *testing.T) {
stopCh := make(chan struct{}) stopCh := make(chan struct{})
go podInformer.Run(stopCh) go podInformer.Run(stopCh)
waitToObservePods(t, podInformer, 2)
go rm.Run(5, stopCh) go rm.Run(5, stopCh)
waitRSStable(t, clientSet, rs, ns.Name) waitRSStable(t, clientSet, rs, ns.Name)
...@@ -354,6 +353,7 @@ func TestUpdateSelectorToRemoveControllerRef(t *testing.T) { ...@@ -354,6 +353,7 @@ func TestUpdateSelectorToRemoveControllerRef(t *testing.T) {
stopCh := make(chan struct{}) stopCh := make(chan struct{})
go podInformer.Run(stopCh) go podInformer.Run(stopCh)
waitToObservePods(t, podInformer, 2)
go rm.Run(5, stopCh) go rm.Run(5, stopCh)
waitRSStable(t, clientSet, rs, ns.Name) waitRSStable(t, clientSet, rs, ns.Name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment