Merge pull request kubernetes#124583 from aroradaman/e2e-net-dial-from-container

k8s-ci-robot · web-flow · commit 7d880fd489d1 · 2024-04-27T11:28:48.000-07:00
e2e/framework network: exit early in DialFromContainer
diff --git a/test/e2e/framework/network/utils.go b/test/e2e/framework/network/utils.go
@@ -325,6 +325,12 @@ func (config *NetworkingTestConfig) DialFromContainer(ctx context.Context, proto
 				responses.Insert(trimmed)
 			}
 		}
+		if responses.Difference(expectedResponses).Len() > 0 {
+			returnMsg := fmt.Errorf("received unexpected responses... \nAttempt %d\nCommand %v\nretrieved %v\nexpected %v", i, cmd, responses, expectedResponses)
+			framework.Logf("encountered error during dial (%v)", returnMsg)
+			return returnMsg
+		}
+
 		framework.Logf("Waiting for responses: %v", expectedResponses.Difference(responses))
 
 		// Check against i+1 so we exit if minTries == maxTries.

Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,12 @@ func (config *NetworkingTestConfig) DialFromContainer(ctx context.Context, proto`
`325`	`325`	`responses.Insert(trimmed)`
`326`	`326`	`}`
`327`	`327`	`}`
	`328`	`+ if responses.Difference(expectedResponses).Len() > 0 {`
	`329`	`+ returnMsg := fmt.Errorf("received unexpected responses... \nAttempt %d\nCommand %v\nretrieved %v\nexpected %v", i, cmd, responses, expectedResponses)`
	`330`	`+ framework.Logf("encountered error during dial (%v)", returnMsg)`
	`331`	`+ return returnMsg`
	`332`	`+ }`
	`333`	`+`
`328`	`334`	`framework.Logf("Waiting for responses: %v", expectedResponses.Difference(responses))`
`329`	`335`
`330`	`336`	`// Check against i+1 so we exit if minTries == maxTries.`