Merge pull request #62914 from sjenning/kubelet-unit-flake

Automatic merge from submit-queue (batch tested with PRs 62914, 63431). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubelet: fix flake in TestUpdateExistingNodeStatusTimeout xref https://github.com/openshift/origin/issues/19443 There are cases where some process, outside the test, attempts to connect to the port we are using to do the test, leading to a attempt count greater than what we expect. To deal with this, just ensure that we have seen *at least* the number of connection attempts we expect. @liggitt ```release-note NONE ```

Merge pull request #62914 from sjenning/kubelet-unit-flake
bc1c2de1 · Kubernetes Submit Queue · GitHub · f4b24526 · dfb88700 · bc1c2de1
Unverified Commit bc1c2de1 authored May 07, 2018 by Kubernetes Submit Queue Committed by GitHub May 07, 2018
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

kubelet_node_status_test.go pkg/kubelet/kubelet_node_status_test.go +2 -2

No files found.
--- a/pkg/kubelet/kubelet_node_status_test.go
+++ b/pkg/kubelet/kubelet_node_status_test.go
@@ -642,8 +642,8 @@ func TestUpdateExistingNodeStatusTimeout(t *testing.T) {
 	assert.Error(t, kubelet.updateNodeStatus())
 	// should have attempted multiple times
-	if actualAttempts := atomic.LoadInt64(&attempts); actualAttempts != nodeStatusUpdateRetry {
+	if actualAttempts := atomic.LoadInt64(&attempts); actualAttempts < nodeStatusUpdateRetry {
-		t.Errorf("Expected %d attempts, got %d", nodeStatusUpdateRetry, actualAttempts)
+		t.Errorf("Expected at least %d attempts, got %d", nodeStatusUpdateRetry, actualAttempts)
 	}
 }