net: deflake TestLookupPort for embedded, security-hardened platforms

Fixes #14576.

Change-Id: I760907c67c97cb827cf48ba7eb0bb2f4f8d4d790
Reviewed-on: https://go-review.googlesource.com/23111
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/error_test.go b/src/net/error_test.go
index 9f496d7d2db5e8c41a3fcbd7bd237afe3e81b8aa..d6de5a3e68f048c3e6d1546e351852f49dea9aeb 100644 (file)
--- a/src/net/error_test.go
+++ b/src/net/error_test.go
@@ -762,3 +762,17 @@ func TestFileError(t *testing.T) {
                ln.Close()
        }
 }
+
+func parseLookupPortError(nestedErr error) error {
+       if nestedErr == nil {
+               return nil
+       }
+
+       switch nestedErr.(type) {
+       case *AddrError, *DNSError:
+               return nil
+       case *os.PathError: // for Plan 9
+               return nil
+       }
+       return fmt.Errorf("unexpected type on 1st nested level: %T", nestedErr)
+}

diff --git a/src/net/lookup_test.go b/src/net/lookup_test.go
index 7dba393cee5c9e0b363c68e44fea46e8e64839ec..1c417b6c9aefde9c037d6b62434d337b24e465cb 100644 (file)
--- a/src/net/lookup_test.go
+++ b/src/net/lookup_test.go
@@ -604,31 +604,16 @@ var lookupPortTests = []struct {
        port    int
        ok      bool
 }{
-       {"tcp", "0", 0, true},
-       {"tcp", "echo", 7, true},
-       {"tcp", "discard", 9, true},
-       {"tcp", "systat", 11, true},
-       {"tcp", "daytime", 13, true},
-       {"tcp", "chargen", 19, true},
-       {"tcp", "ftp-data", 20, true},
-       {"tcp", "ftp", 21, true},
-       {"tcp", "telnet", 23, true},
-       {"tcp", "smtp", 25, true},
-       {"tcp", "time", 37, true},
-       {"tcp", "domain", 53, true},
-       {"tcp", "finger", 79, true},
-       {"tcp", "42", 42, true},
+       // See http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml
+       //
+       // Please be careful about adding new mappings for testings.
+       // There are platforms having incomplete mappings for
+       // restricted resource access and security reasons.
 
+       {"tcp", "0", 0, true},
+       {"tcp", "http", 80, true},
        {"udp", "0", 0, true},
-       {"udp", "echo", 7, true},
-       {"udp", "tftp", 69, true},
-       {"udp", "bootpc", 68, true},
-       {"udp", "bootps", 67, true},
        {"udp", "domain", 53, true},
-       {"udp", "ntp", 123, true},
-       {"udp", "snmp", 161, true},
-       {"udp", "syslog", 514, true},
-       {"udp", "42", 42, true},
 
        {"--badnet--", "zzz", 0, false},
        {"tcp", "--badport--", 0, false},
@@ -640,9 +625,11 @@ var lookupPortTests = []struct {
 
        // Issue 13610: LookupPort("tcp", "")
        {"tcp", "", 0, true},
-       {"tcp6", "", 0, true},
        {"tcp4", "", 0, true},
+       {"tcp6", "", 0, true},
        {"udp", "", 0, true},
+       {"udp4", "", 0, true},
+       {"udp6", "", 0, true},
 }
 
 func TestLookupPort(t *testing.T) {
@@ -656,8 +643,14 @@ func TestLookupPort(t *testing.T) {
        }
 
        for _, tt := range lookupPortTests {
-               if port, err := LookupPort(tt.network, tt.name); port != tt.port || (err == nil) != tt.ok {
+               port, err := LookupPort(tt.network, tt.name)
+               if port != tt.port || (err == nil) != tt.ok {
                        t.Errorf("LookupPort(%q, %q) = %d, %v; want %d, error=%t", tt.network, tt.name, port, err, tt.port, !tt.ok)
                }
+               if err != nil {
+                       if perr := parseLookupPortError(err); perr != nil {
+                               t.Error(perr)
+                       }
+               }
        }
 }