Merge pull request #43804 from Crazykev/wrong-err

Automatic merge from submit-queue fix wrong error return Signed-off-by: Crazykev <crazykev@zju.edu.cn> **What this PR does / why we need it**: The err return here is wrong, correct it. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #43804 from Crazykev/wrong-err
ad3e0903 · Kubernetes Submit Queue · GitHub · 4957a232 · 6f86cd1a · ad3e0903
Commit ad3e0903 authored Apr 07, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.go test/e2e/framework/util.go +1 -1

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -2252,7 +2252,7 @@ func (f *Framework) MatchContainerOutput(
 			}
 			Logf("Output of node %q pod %q container %q: %s", podStatus.Spec.NodeName, podStatus.Name, container.Name, logs)
 		}
-		return fmt.Errorf("expected pod %q success: %v", createdPod.Name, err)
+		return fmt.Errorf("expected pod %q success: %v", createdPod.Name, podErr)
 	}

 	Logf("Trying to get logs from node %s pod %s container %s: %v",