net: don't recheck goosPrefersCgo in hostLookupOrder

We only did it for testing. Remove the single test that required it.

Change-Id: Ib6c3a2debfd3f48e95af37f23fdfde847ff87a41
Reviewed-on: https://go-review.googlesource.com/c/go/+/490395
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Damien Neil <dneil@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>

diff --git a/src/net/conf.go b/src/net/conf.go
index 6386078132a4ed504cecc5aa073c111c6137bae7..d11a5685027718c86298f41f257c4c906e5d9293 100644 (file)
--- a/src/net/conf.go
+++ b/src/net/conf.go
@@ -124,7 +124,7 @@ func initConfVal() {
        }
 
        // Some operating systems always prefer the cgo resolver.
-       if goosPrefersCgo(runtime.GOOS) {
+       if goosPrefersCgo() {
                confVal.preferCgo = true
                return
        }
@@ -155,8 +155,8 @@ func initConfVal() {
 
 // goosPreferCgo reports whether the GOOS value passed in prefers
 // the cgo resolver.
-func goosPrefersCgo(goos string) bool {
-       switch goos {
+func goosPrefersCgo() bool {
+       switch runtime.GOOS {
        // Historically on Windows and Plan 9 we prefer the
        // cgo resolver (which doesn't use the cgo tool) rather than
        // the go resolver. This is because originally these
@@ -227,13 +227,6 @@ func (c *conf) hostLookupOrder(r *Resolver, hostname string) (ret hostLookupOrde
                // Neither resolver was explicitly requested
                // and we have no preference.
 
-               // For testing purposes only, recheck the GOOS.
-               // This lets TestConfHostLookupOrder test different
-               // GOOS values.
-               if goosPrefersCgo(c.goos) {
-                       return hostLookupCgo, nil
-               }
-
                if bytealg.IndexByteString(hostname, '\\') != -1 || bytealg.IndexByteString(hostname, '%') != -1 {
                        // Don't deal with special form hostnames
                        // with backslashes or '%'.

diff --git a/src/net/conf_test.go b/src/net/conf_test.go
index 6c9d2477134f1c90b2638b25bb32ce13cc0f3475..08d774bfe2c303c2d2f80e107c290194eecfdbc5 100644 (file)
--- a/src/net/conf_test.go
+++ b/src/net/conf_test.go
@@ -341,18 +341,6 @@ func TestConfHostLookupOrder(t *testing.T) {
                        nss:       nssStr(t, "foo: bar"),
                        hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupCgo}},
                },
-               // Android should always use cgo.
-               {
-                       name: "android",
-                       c: &conf{
-                               goos: "android",
-                       },
-                       resolv: defaultResolvConf,
-                       nss:    nssStr(t, ""),
-                       hostTests: []nssHostTest{
-                               {"x.com", "myhostname", hostLookupCgo},
-                       },
-               },
                // Issue 24393: make sure "Resolver.PreferGo = true" acts like netgo.
                {
                        name:     "resolver-prefergo",