Merge pull request kubernetes#88070 from sshukun/remove-tautological-condition

k8s-ci-robot · web-flow · commit fb6f5d739b08 · 2020-02-12T21:37:35.000-08:00
Remove tautological condition in test/e2e/framework/pod/resource.go
diff --git a/test/e2e/framework/pod/resource.go b/test/e2e/framework/pod/resource.go
@@ -520,7 +520,7 @@ func getPodLogsInternal(c clientset.Interface, namespace, podName, containerName
 	if err != nil {
 		return "", err
 	}
-	if err == nil && strings.Contains(string(logs), "Internal Error") {
+	if strings.Contains(string(logs), "Internal Error") {
 		return "", fmt.Errorf("Fetched log contains \"Internal Error\": %q", string(logs))
 	}
 	return string(logs), err

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ func getPodLogsInternal(c clientset.Interface, namespace, podName, containerName`
`520`	`520`	`if err != nil {`
`521`	`521`	`return "", err`
`522`	`522`	`}`
`523`		`- if err == nil && strings.Contains(string(logs), "Internal Error") {`
	`523`	`+ if strings.Contains(string(logs), "Internal Error") {`
`524`	`524`	`return "", fmt.Errorf("Fetched log contains \"Internal Error\": %q", string(logs))`
`525`	`525`	`}`
`526`	`526`	`return string(logs), err`