Skip to content

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

Merge pull request #51264 from m1093782566/e2e-maxTries

Automatic merge from submit-queue (batch tested with PRs 50889, 51347, 50582, 51297, 51264) Fix e2e network util wrong output message **What this PR does / why we need it**: See https://github.com/kubernetes/kubernetes/blob/master/test/e2e/framework/networking_utils.go#L217 and https://github.com/kubernetes/kubernetes/blob/master/test/e2e/framework/networking_utils.go#L273 I assume it should be `minTries` -> `MaxTries` This PR fixes the wrong output message. **Which issue this PR fixes**: fixes #51265 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 26165133 b8edd9b8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e/framework/networking_utils.go
View file @ b65d665b
...@@ -214,7 +214,7 @@ func (config *NetworkingTestConfig) DialFromContainer(protocol, containerIP, tar ...@@ -214,7 +214,7 @@ func (config *NetworkingTestConfig) DialFromContainer(protocol, containerIP, tar
} }
config.diagnoseMissingEndpoints(eps) config.diagnoseMissingEndpoints(eps)
Failf("Failed to find expected endpoints:\nTries %d\nCommand %v\nretrieved %v\nexpected %v\n", minTries, cmd, eps, expectedEps) Failf("Failed to find expected endpoints:\nTries %d\nCommand %v\nretrieved %v\nexpected %v\n", maxTries, cmd, eps, expectedEps)
} }
// DialFromNode executes a tcp or udp request based on protocol via kubectl exec // DialFromNode executes a tcp or udp request based on protocol via kubectl exec
...@@ -270,7 +270,7 @@ func (config *NetworkingTestConfig) DialFromNode(protocol, targetIP string, targ ...@@ -270,7 +270,7 @@ func (config *NetworkingTestConfig) DialFromNode(protocol, targetIP string, targ
} }
config.diagnoseMissingEndpoints(eps) config.diagnoseMissingEndpoints(eps)
Failf("Failed to find expected endpoints:\nTries %d\nCommand %v\nretrieved %v\nexpected %v\n", minTries, cmd, eps, expectedEps) Failf("Failed to find expected endpoints:\nTries %d\nCommand %v\nretrieved %v\nexpected %v\n", maxTries, cmd, eps, expectedEps)
} }
// GetSelfURL executes a curl against the given path via kubectl exec into a // GetSelfURL executes a curl against the given path via kubectl exec into a
......
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