diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2013-03-04 21:27:36 +0100 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2013-03-04 21:27:36 +0100 |
| commit | 04b08da9af0c450d645ab7389d1467308cfc2db8 (patch) | |
| tree | db247935fa4f2f94408edc3acd5d0d4f997aa0d8 /src/pkg/net/dialgoogle_test.go | |
| parent | 917c5fb8ec48e22459d77e3849e6d388f93d3260 (diff) | |
| download | golang-upstream/1.1_hg20130304.tar.gz | |
Imported Upstream version 1.1~hg20130304upstream/1.1_hg20130304
Diffstat (limited to 'src/pkg/net/dialgoogle_test.go')
| -rw-r--r-- | src/pkg/net/dialgoogle_test.go | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/pkg/net/dialgoogle_test.go b/src/pkg/net/dialgoogle_test.go index 03c449972..73a94f5bf 100644 --- a/src/pkg/net/dialgoogle_test.go +++ b/src/pkg/net/dialgoogle_test.go @@ -41,17 +41,6 @@ func doDial(t *testing.T, network, addr string) { fd.Close() } -func TestLookupCNAME(t *testing.T) { - if testing.Short() || !*testExternal { - t.Logf("skipping test to avoid external network") - return - } - cname, err := LookupCNAME("www.google.com") - if !strings.HasSuffix(cname, ".l.google.com.") || err != nil { - t.Errorf(`LookupCNAME("www.google.com.") = %q, %v, want "*.l.google.com.", nil`, cname, err) - } -} - var googleaddrsipv4 = []string{ "%d.%d.%d.%d:80", "www.google.com:80", @@ -67,8 +56,7 @@ var googleaddrsipv4 = []string{ func TestDialGoogleIPv4(t *testing.T) { if testing.Short() || !*testExternal { - t.Logf("skipping test to avoid external network") - return + t.Skip("skipping test to avoid external network") } // Insert an actual IPv4 address for google.com @@ -123,12 +111,14 @@ var googleaddrsipv6 = []string{ func TestDialGoogleIPv6(t *testing.T) { if testing.Short() || !*testExternal { - t.Logf("skipping test to avoid external network") - return + t.Skip("skipping test to avoid external network") } // Only run tcp6 if the kernel will take it. - if !*testIPv6 || !supportsIPv6 { - return + if !supportsIPv6 { + t.Skip("skipping test; ipv6 is not supported") + } + if !*testIPv6 { + t.Skip("test disabled; use -ipv6 to enable") } // Insert an actual IPv6 address for ipv6.google.com |