miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Fix unit tests on Win10 (attempts 1 and 2)" 

This reverts commit 92dda0d55a.
This reverts commit 5a1fdc8cd6.
This commit is contained in:
William Elwood 2020-06-10 19:43:32 +01:00
parent f4d519092b
commit 2018945fdf
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dnscrypt-proxy/sources_test.go
View File

@ -312,11 +312,10 @@ func prepSourceTestDownload(t *testing.T, d *SourceTestData, e *SourceTestExpect
case TestStateOpenErr, TestStateOpenSigErr: case TestStateOpenErr, TestStateOpenSigErr:
if u, err := url.Parse(serverURL + path); err == nil { if u, err := url.Parse(serverURL + path); err == nil {
host, port := ExtractHostAndPort(u.Host, -1) host, port := ExtractHostAndPort(u.Host, -1)
u.Host = fmt.Sprintf("%s:%d", host, port|0x10000) u.Host = fmt.Sprintf("%s:%d", host, port|0x10000) // high numeric port is parsed but then fails to connect
serverURL = u.String() serverURL = u.String()
} }
// Win10 treats an invalid port as part of the hostname, then tries DNS lookup and magic http->https upgrades simultaneously e.err = "invalid port"
e.err = "invalid port|no such host|too many colons in address"
case TestStatePathErr: case TestStatePathErr:
path = "..." + path // non-numeric port fails URL parsing path = "..." + path // non-numeric port fails URL parsing
} }