From 2018945fdf22d4f0586fe1031cd85f6ed37cfce9 Mon Sep 17 00:00:00 2001 From: William Elwood Date: Wed, 10 Jun 2020 19:43:32 +0100 Subject: [PATCH] Revert "Fix unit tests on Win10 (attempts 1 and 2)" This reverts commit 92dda0d55a82f1ad180205e716c67f7c890448ff. This reverts commit 5a1fdc8cd698e36979cfbe62c4d95893363864ee. --- dnscrypt-proxy/sources_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dnscrypt-proxy/sources_test.go b/dnscrypt-proxy/sources_test.go index 8e738b6f..7a8bd898 100644 --- a/dnscrypt-proxy/sources_test.go +++ b/dnscrypt-proxy/sources_test.go @@ -312,11 +312,10 @@ func prepSourceTestDownload(t *testing.T, d *SourceTestData, e *SourceTestExpect case TestStateOpenErr, TestStateOpenSigErr: if u, err := url.Parse(serverURL + path); err == nil { 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() } - // Win10 treats an invalid port as part of the hostname, then tries DNS lookup and magic http->https upgrades simultaneously - e.err = "invalid port|no such host|too many colons in address" + e.err = "invalid port" case TestStatePathErr: path = "..." + path // non-numeric port fails URL parsing }