Merge pull request #26123 from brendandburns/flaker

Automatic merge from submit-queue Add some extra checking in the tests to prevent flakes. Attempts to fix https://github.com/kubernetes/kubernetes/issues/25967 The hypothesis is that somehow waitTest() catches an idle that occurs before all changes have been applied. This will block until the expected number of changes have arrived.

Merge pull request #26123 from brendandburns/flaker
70a71990 · k8s-merge-robot · 28a60157 · 88663fc5 · 70a71990
Commit 70a71990 authored May 25, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

controller_test.go pkg/controller/persistentvolume/controller_test.go +7 -2

No files found.
--- a/pkg/controller/persistentvolume/controller_test.go
+++ b/pkg/controller/persistentvolume/controller_test.go
@@ -33,6 +33,7 @@ import (
 // can't reliably simulate periodic sync of volumes/claims - it would be
 // either very timing-sensitive or slow to wait for real periodic sync.
 func TestControllerSync(t *testing.T) {
+	expectedChanges := []int{1, 4, 1, 1}
 	tests := []controllerTest{
 		// [Unit test set 5] - controller tests.
 		// We test the controller as if
@@ -121,7 +122,7 @@ func TestControllerSync(t *testing.T) {
 		},
 	}

-	for _, test := range tests {
+	for ix, test := range tests {
 		glog.V(4).Infof("starting test %q", test.name)

 		// Initialize the controller
@@ -148,13 +149,17 @@ func TestControllerSync(t *testing.T) {
 			time.Sleep(10 * time.Millisecond)
 		}

+		count := reactor.getChangeCount()
+
 		// Call the tested function
 		err := test.test(ctrl, reactor, test)
 		if err != nil {
 			t.Errorf("Test %q initial test call failed: %v", test.name, err)
 		}

-		reactor.waitTest()
+		for reactor.getChangeCount() < count+expectedChanges[ix] {
+			reactor.waitTest()
+		}

 		evaluateTestResults(ctrl, reactor, test, t)
 	}