Skip to content

Commit cc6feab

Browse files
stefanbFiloSottile
authored andcommitted
net/url: fail TestParseErrors test when getting an unwanted error
The TestParseErrors test function was not strict with unwanted errors received from url.Parse(). It was not failing in such cases, now it does Fixes #33646 Updates #29098 Change-Id: I069521093e2bff8b1fcd41ffd3f9799f3108bc61 GitHub-Last-Rev: e6844c5 GitHub-Pull-Request: #33876 Reviewed-on: https://go-review.googlesource.com/c/go/+/191966 Run-TryBot: Filippo Valsorda <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Filippo Valsorda <[email protected]>
1 parent 2b59894 commit cc6feab

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/net/url/url_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,16 +1429,16 @@ func TestParseErrors(t *testing.T) {
14291429
{"http://[::1]/", false},
14301430
{"http://[::1]a", true},
14311431
{"http://[::1]%23", true},
1432-
{"http://[::1%25en0]", false}, // valid zone id
1433-
{"http://[::1]:", false}, // colon, but no port OK
1434-
{"http://x:", false}, // colon, but no port OK
1435-
{"http://[::1]:%38%30", true}, // not allowed: % encoding only for non-ASCII
1436-
{"http://[::1%25%41]", false}, // RFC 6874 allows over-escaping in zone
1437-
{"http://[%10::1]", true}, // no %xx escapes in IP address
1438-
{"http://[::1]/%48", false}, // %xx in path is fine
1439-
{"http://%41:8080/", true}, // not allowed: % encoding only for non-ASCII
1440-
{"mysql://x@y(z:123)/foo", false}, // golang.org/issue/12023
1441-
{"mysql://x@y(1.2.3.4:123)/foo", false},
1432+
{"http://[::1%25en0]", false}, // valid zone id
1433+
{"http://[::1]:", false}, // colon, but no port OK
1434+
{"http://x:", false}, // colon, but no port OK
1435+
{"http://[::1]:%38%30", true}, // not allowed: % encoding only for non-ASCII
1436+
{"http://[::1%25%41]", false}, // RFC 6874 allows over-escaping in zone
1437+
{"http://[%10::1]", true}, // no %xx escapes in IP address
1438+
{"http://[::1]/%48", false}, // %xx in path is fine
1439+
{"http://%41:8080/", true}, // not allowed: % encoding only for non-ASCII
1440+
{"mysql://x@y(z:123)/foo", true}, // not well-formed per RFC 3986, golang.org/issue/33646
1441+
{"mysql://x@y(1.2.3.4:123)/foo", true},
14421442

14431443
{"http://[]%20%48%54%54%50%2f%31%2e%31%0a%4d%79%48%65%61%64%65%72%3a%20%31%32%33%0a%0a/", true}, // golang.org/issue/11208
14441444
{"http://a b.com/", true}, // no space in host name please
@@ -1456,7 +1456,7 @@ func TestParseErrors(t *testing.T) {
14561456
continue
14571457
}
14581458
if err != nil {
1459-
t.Logf("Parse(%q) = %v; want no error", tt.in, err)
1459+
t.Errorf("Parse(%q) = %v; want no error", tt.in, err)
14601460
}
14611461
}
14621462
}

0 commit comments

Comments
 (0)