net: reorganize test files

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5694063

diff --git a/src/pkg/net/dial_test.go b/src/pkg/net/dial_test.go
index e5a797e13bf6ca0f6e24e64bfe1be3ea0946bcf5..8a91ea284a4c157e8191440f20ee67b1084f6609 100644 (file)
--- a/src/pkg/net/dial_test.go
+++ b/src/pkg/net/dial_test.go
@@ -5,6 +5,8 @@
 package net
 
 import (
+       "flag"
+       "regexp"
        "runtime"
        "testing"
        "time"
@@ -128,3 +130,82 @@ func TestSelfConnect(t *testing.T) {
                }
        }
 }
+
+var runErrorTest = flag.Bool("run_error_test", false, "let TestDialError check for dns errors")
+
+type DialErrorTest struct {
+       Net     string
+       Raddr   string
+       Pattern string
+}
+
+var dialErrorTests = []DialErrorTest{
+       {
+               "datakit", "mh/astro/r70",
+               "dial datakit mh/astro/r70: unknown network datakit",
+       },
+       {
+               "tcp", "127.0.0.1:☺",
+               "dial tcp 127.0.0.1:☺: unknown port tcp/☺",
+       },
+       {
+               "tcp", "no-such-name.google.com.:80",
+               "dial tcp no-such-name.google.com.:80: lookup no-such-name.google.com.( on .*)?: no (.*)",
+       },
+       {
+               "tcp", "no-such-name.no-such-top-level-domain.:80",
+               "dial tcp no-such-name.no-such-top-level-domain.:80: lookup no-such-name.no-such-top-level-domain.( on .*)?: no (.*)",
+       },
+       {
+               "tcp", "no-such-name:80",
+               `dial tcp no-such-name:80: lookup no-such-name\.(.*\.)?( on .*)?: no (.*)`,
+       },
+       {
+               "tcp", "mh/astro/r70:http",
+               "dial tcp mh/astro/r70:http: lookup mh/astro/r70: invalid domain name",
+       },
+       {
+               "unix", "/etc/file-not-found",
+               "dial unix /etc/file-not-found: no such file or directory",
+       },
+       {
+               "unix", "/etc/",
+               "dial unix /etc/: (permission denied|socket operation on non-socket|connection refused)",
+       },
+       {
+               "unixpacket", "/etc/file-not-found",
+               "dial unixpacket /etc/file-not-found: no such file or directory",
+       },
+       {
+               "unixpacket", "/etc/",
+               "dial unixpacket /etc/: (permission denied|socket operation on non-socket|connection refused)",
+       },
+}
+
+var duplicateErrorPattern = `dial (.*) dial (.*)`
+
+func TestDialError(t *testing.T) {
+       if !*runErrorTest {
+               t.Logf("test disabled; use --run_error_test to enable")
+               return
+       }
+       for i, tt := range dialErrorTests {
+               c, err := Dial(tt.Net, tt.Raddr)
+               if c != nil {
+                       c.Close()
+               }
+               if err == nil {
+                       t.Errorf("#%d: nil error, want match for %#q", i, tt.Pattern)
+                       continue
+               }
+               s := err.Error()
+               match, _ := regexp.MatchString(tt.Pattern, s)
+               if !match {
+                       t.Errorf("#%d: %q, want match for %#q", i, s, tt.Pattern)
+               }
+               match, _ = regexp.MatchString(duplicateErrorPattern, s)
+               if match {
+                       t.Errorf("#%d: %q, duplicate error return from Dial", i, s)
+               }
+       }
+}

diff --git a/src/pkg/net/lookup_test.go b/src/pkg/net/lookup_test.go
index 7b9ea844cd4f9a39f839d12ae5c9faa6d0d5f2c3..b5e9e63e0bd597df96e4d3ff79576fafcd5fff47 100644 (file)
--- a/src/pkg/net/lookup_test.go
+++ b/src/pkg/net/lookup_test.go
@@ -78,3 +78,40 @@ func TestGoogleDNSAddr(t *testing.T) {
                t.Errorf("no results")
        }
 }
+
+var revAddrTests = []struct {
+       Addr      string
+       Reverse   string
+       ErrPrefix string
+}{
+       {"1.2.3.4", "4.3.2.1.in-addr.arpa.", ""},
+       {"245.110.36.114", "114.36.110.245.in-addr.arpa.", ""},
+       {"::ffff:12.34.56.78", "78.56.34.12.in-addr.arpa.", ""},
+       {"::1", "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.", ""},
+       {"1::", "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.ip6.arpa.", ""},
+       {"1234:567::89a:bcde", "e.d.c.b.a.9.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.6.5.0.4.3.2.1.ip6.arpa.", ""},
+       {"1234:567:fefe:bcbc:adad:9e4a:89a:bcde", "e.d.c.b.a.9.8.0.a.4.e.9.d.a.d.a.c.b.c.b.e.f.e.f.7.6.5.0.4.3.2.1.ip6.arpa.", ""},
+       {"1.2.3", "", "unrecognized address"},
+       {"1.2.3.4.5", "", "unrecognized address"},
+       {"1234:567:bcbca::89a:bcde", "", "unrecognized address"},
+       {"1234:567::bcbc:adad::89a:bcde", "", "unrecognized address"},
+}
+
+func TestReverseAddress(t *testing.T) {
+       for i, tt := range revAddrTests {
+               a, err := reverseaddr(tt.Addr)
+               if len(tt.ErrPrefix) > 0 && err == nil {
+                       t.Errorf("#%d: expected %q, got <nil> (error)", i, tt.ErrPrefix)
+                       continue
+               }
+               if len(tt.ErrPrefix) == 0 && err != nil {
+                       t.Errorf("#%d: expected <nil>, got %q (error)", i, err)
+               }
+               if err != nil && err.(*DNSError).Err != tt.ErrPrefix {
+                       t.Errorf("#%d: expected %q, got %q (mismatched error)", i, tt.ErrPrefix, err.(*DNSError).Err)
+               }
+               if a != tt.Reverse {
+                       t.Errorf("#%d: expected %q, got %q (reverse address)", i, tt.Reverse, a)
+               }
+       }
+}

diff --git a/src/pkg/net/net_test.go b/src/pkg/net/net_test.go
index 9e792a1f85c1cc480ed04717289b3c4d77fca45d..c1a90de0131b624b7d4b346934bfcba19f0e7fc9 100644 (file)
--- a/src/pkg/net/net_test.go
+++ b/src/pkg/net/net_test.go
@@ -5,130 +5,12 @@
 package net
 
 import (
-       "flag"
        "io"
-       "regexp"
        "runtime"
        "testing"
        "time"
 )
 
-var runErrorTest = flag.Bool("run_error_test", false, "let TestDialError check for dns errors")
-
-type DialErrorTest struct {
-       Net     string
-       Raddr   string
-       Pattern string
-}
-
-var dialErrorTests = []DialErrorTest{
-       {
-               "datakit", "mh/astro/r70",
-               "dial datakit mh/astro/r70: unknown network datakit",
-       },
-       {
-               "tcp", "127.0.0.1:☺",
-               "dial tcp 127.0.0.1:☺: unknown port tcp/☺",
-       },
-       {
-               "tcp", "no-such-name.google.com.:80",
-               "dial tcp no-such-name.google.com.:80: lookup no-such-name.google.com.( on .*)?: no (.*)",
-       },
-       {
-               "tcp", "no-such-name.no-such-top-level-domain.:80",
-               "dial tcp no-such-name.no-such-top-level-domain.:80: lookup no-such-name.no-such-top-level-domain.( on .*)?: no (.*)",
-       },
-       {
-               "tcp", "no-such-name:80",
-               `dial tcp no-such-name:80: lookup no-such-name\.(.*\.)?( on .*)?: no (.*)`,
-       },
-       {
-               "tcp", "mh/astro/r70:http",
-               "dial tcp mh/astro/r70:http: lookup mh/astro/r70: invalid domain name",
-       },
-       {
-               "unix", "/etc/file-not-found",
-               "dial unix /etc/file-not-found: no such file or directory",
-       },
-       {
-               "unix", "/etc/",
-               "dial unix /etc/: (permission denied|socket operation on non-socket|connection refused)",
-       },
-       {
-               "unixpacket", "/etc/file-not-found",
-               "dial unixpacket /etc/file-not-found: no such file or directory",
-       },
-       {
-               "unixpacket", "/etc/",
-               "dial unixpacket /etc/: (permission denied|socket operation on non-socket|connection refused)",
-       },
-}
-
-var duplicateErrorPattern = `dial (.*) dial (.*)`
-
-func TestDialError(t *testing.T) {
-       if !*runErrorTest {
-               t.Logf("test disabled; use --run_error_test to enable")
-               return
-       }
-       for i, tt := range dialErrorTests {
-               c, err := Dial(tt.Net, tt.Raddr)
-               if c != nil {
-                       c.Close()
-               }
-               if err == nil {
-                       t.Errorf("#%d: nil error, want match for %#q", i, tt.Pattern)
-                       continue
-               }
-               s := err.Error()
-               match, _ := regexp.MatchString(tt.Pattern, s)
-               if !match {
-                       t.Errorf("#%d: %q, want match for %#q", i, s, tt.Pattern)
-               }
-               match, _ = regexp.MatchString(duplicateErrorPattern, s)
-               if match {
-                       t.Errorf("#%d: %q, duplicate error return from Dial", i, s)
-               }
-       }
-}
-
-var revAddrTests = []struct {
-       Addr      string
-       Reverse   string
-       ErrPrefix string
-}{
-       {"1.2.3.4", "4.3.2.1.in-addr.arpa.", ""},
-       {"245.110.36.114", "114.36.110.245.in-addr.arpa.", ""},
-       {"::ffff:12.34.56.78", "78.56.34.12.in-addr.arpa.", ""},
-       {"::1", "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.", ""},
-       {"1::", "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.ip6.arpa.", ""},
-       {"1234:567::89a:bcde", "e.d.c.b.a.9.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.6.5.0.4.3.2.1.ip6.arpa.", ""},
-       {"1234:567:fefe:bcbc:adad:9e4a:89a:bcde", "e.d.c.b.a.9.8.0.a.4.e.9.d.a.d.a.c.b.c.b.e.f.e.f.7.6.5.0.4.3.2.1.ip6.arpa.", ""},
-       {"1.2.3", "", "unrecognized address"},
-       {"1.2.3.4.5", "", "unrecognized address"},
-       {"1234:567:bcbca::89a:bcde", "", "unrecognized address"},
-       {"1234:567::bcbc:adad::89a:bcde", "", "unrecognized address"},
-}
-
-func TestReverseAddress(t *testing.T) {
-       for i, tt := range revAddrTests {
-               a, err := reverseaddr(tt.Addr)
-               if len(tt.ErrPrefix) > 0 && err == nil {
-                       t.Errorf("#%d: expected %q, got <nil> (error)", i, tt.ErrPrefix)
-                       continue
-               }
-               if len(tt.ErrPrefix) == 0 && err != nil {
-                       t.Errorf("#%d: expected <nil>, got %q (error)", i, err)
-               }
-               if err != nil && err.(*DNSError).Err != tt.ErrPrefix {
-                       t.Errorf("#%d: expected %q, got %q (mismatched error)", i, tt.ErrPrefix, err.(*DNSError).Err)
-               }
-               if a != tt.Reverse {
-                       t.Errorf("#%d: expected %q, got %q (reverse address)", i, tt.Reverse, a)
-               }
-       }
-}
-
 func TestShutdown(t *testing.T) {
        if runtime.GOOS == "plan9" {
                return