Commit 7301065f authored by Mikio Hara's avatar Mikio Hara

net: make -external flag for tests default to true

go test -short # like in the build; no external stuff
go test # long tests, + external
go test -external=false # long tests, no external

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5696079
parent 564a1f33
...@@ -42,9 +42,8 @@ func doDial(t *testing.T, network, addr string) { ...@@ -42,9 +42,8 @@ func doDial(t *testing.T, network, addr string) {
} }
func TestLookupCNAME(t *testing.T) { func TestLookupCNAME(t *testing.T) {
if testing.Short() { if testing.Short() || !*testExternal {
// Don't use external network. t.Logf("skipping test to avoid external network")
t.Logf("skipping external network test during -short")
return return
} }
cname, err := LookupCNAME("www.google.com") cname, err := LookupCNAME("www.google.com")
...@@ -67,9 +66,8 @@ var googleaddrsipv4 = []string{ ...@@ -67,9 +66,8 @@ var googleaddrsipv4 = []string{
} }
func TestDialGoogleIPv4(t *testing.T) { func TestDialGoogleIPv4(t *testing.T) {
if testing.Short() { if testing.Short() || !*testExternal {
// Don't use external network. t.Logf("skipping test to avoid external network")
t.Logf("skipping external network test during -short")
return return
} }
...@@ -124,9 +122,8 @@ var googleaddrsipv6 = []string{ ...@@ -124,9 +122,8 @@ var googleaddrsipv6 = []string{
} }
func TestDialGoogleIPv6(t *testing.T) { func TestDialGoogleIPv6(t *testing.T) {
if testing.Short() { if testing.Short() || !*testExternal {
// Don't use external network. t.Logf("skipping test to avoid external network")
t.Logf("skipping external network test during -short")
return return
} }
// Only run tcp6 if the kernel will take it. // Only run tcp6 if the kernel will take it.
......
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"testing" "testing"
) )
var testExternal = flag.Bool("external", false, "allow use of external networks during test") var testExternal = flag.Bool("external", true, "allow use of external networks during long test")
func TestGoogleSRV(t *testing.T) { func TestGoogleSRV(t *testing.T) {
if testing.Short() || !*testExternal { if testing.Short() || !*testExternal {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment