From 4510993b673f63195b779e3f5ea8aeac995687b5 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Wed, 14 Jan 2015 13:14:57 -0500 Subject: [PATCH] pkg/transport: tests always listen on 127.0.0.1 This avoids firewall prompts when running tests on OSX. --- pkg/transport/keepalive_listener_test.go | 2 +- pkg/transport/listener_test.go | 4 ++-- pkg/transport/timeout_listener_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/transport/keepalive_listener_test.go b/pkg/transport/keepalive_listener_test.go index a3586556a..8eebc208e 100644 --- a/pkg/transport/keepalive_listener_test.go +++ b/pkg/transport/keepalive_listener_test.go @@ -25,7 +25,7 @@ import ( // that accepts connections. // TODO: verify the keepalive option is set correctly func TestNewKeepAliveListener(t *testing.T) { - ln, err := NewKeepAliveListener(":0", "http", TLSInfo{}) + ln, err := NewKeepAliveListener("127.0.0.1:0", "http", TLSInfo{}) if err != nil { t.Fatalf("unexpected NewKeepAliveListener error: %v", err) } diff --git a/pkg/transport/listener_test.go b/pkg/transport/listener_test.go index b2c6ba9d5..59a333ff9 100644 --- a/pkg/transport/listener_test.go +++ b/pkg/transport/listener_test.go @@ -55,7 +55,7 @@ func TestNewListenerTLSInfo(t *testing.T) { defer os.Remove(tmp) tlsInfo := TLSInfo{CertFile: tmp, KeyFile: tmp} tlsInfo.parseFunc = fakeCertificateParserFunc(tls.Certificate{}, nil) - ln, err := NewListener(":0", "https", tlsInfo) + ln, err := NewListener("127.0.0.1:0", "https", tlsInfo) if err != nil { t.Fatalf("unexpected NewListener error: %v", err) } @@ -74,7 +74,7 @@ func TestNewListenerTLSInfo(t *testing.T) { func TestNewListenerTLSInfoNonexist(t *testing.T) { tlsInfo := TLSInfo{CertFile: "@badname", KeyFile: "@badname"} - _, err := NewListener(":0", "https", tlsInfo) + _, err := NewListener("127.0.0.1:0", "https", tlsInfo) werr := &os.PathError{ Op: "open", Path: "@badname", diff --git a/pkg/transport/timeout_listener_test.go b/pkg/transport/timeout_listener_test.go index a4696cc7d..4b7bb76de 100644 --- a/pkg/transport/timeout_listener_test.go +++ b/pkg/transport/timeout_listener_test.go @@ -25,7 +25,7 @@ import ( // TestNewTimeoutListener tests that NewTimeoutListener returns a // rwTimeoutListener struct with timeouts set. func TestNewTimeoutListener(t *testing.T) { - l, err := NewTimeoutListener(":0", "http", TLSInfo{}, time.Hour, time.Hour) + l, err := NewTimeoutListener("127.0.0.1:0", "http", TLSInfo{}, time.Hour, time.Hour) if err != nil { t.Fatalf("unexpected NewTimeoutListener error: %v", err) }