fix neq expression

shawnh2 · shawnh2 · commit 7b69ccdb176c · 2023-08-09T23:41:26.000+08:00
Signed-off-by: sh2 &lt;shawnhxh@outlook.com&gt;
diff --git a/conformance/utils/http/http.go b/conformance/utils/http/http.go
@@ -345,7 +345,7 @@ func CompareRequest(t *testing.T, req *roundtripper.Request, cReq *roundtripper.
 			if strings.ToLower(cRes.RedirectRequest.Scheme) == "https" && gotPort != "443" && gotPort != "" {
 				return fmt.Errorf("for https scheme, expected redirected port to be 443 or not set, got %q", gotPort)
 			}
-			if strings.ToLower(cRes.RedirectRequest.Scheme) != "http" || strings.ToLower(cRes.RedirectRequest.Scheme) == "https" {
+			if strings.ToLower(cRes.RedirectRequest.Scheme) != "http" || strings.ToLower(cRes.RedirectRequest.Scheme) != "https" {
 				t.Logf("Can't validate redirectPort for unrecognized scheme %v", cRes.RedirectRequest.Scheme)
 			}
 		} else if expected.RedirectRequest.Port != gotPort {

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ func CompareRequest(t testing.T, req roundtripper.Request, cReq *roundtripper.`
`345`	`345`	`if strings.ToLower(cRes.RedirectRequest.Scheme) == "https" && gotPort != "443" && gotPort != "" {`
`346`	`346`	`return fmt.Errorf("for https scheme, expected redirected port to be 443 or not set, got %q", gotPort)`
`347`	`347`	`}`
`348`		`- if strings.ToLower(cRes.RedirectRequest.Scheme) != "http" \|\| strings.ToLower(cRes.RedirectRequest.Scheme) == "https" {`
	`348`	`+ if strings.ToLower(cRes.RedirectRequest.Scheme) != "http" \|\| strings.ToLower(cRes.RedirectRequest.Scheme) != "https" {`
`349`	`349`	`t.Logf("Can't validate redirectPort for unrecognized scheme %v", cRes.RedirectRequest.Scheme)`
`350`	`350`	`}`
`351`	`351`	`} else if expected.RedirectRequest.Port != gotPort {`