From a6aa1097f115eaf2f17cf9cf9840d4836f147aff Mon Sep 17 00:00:00 2001 From: Seebs Date: Fri, 18 Mar 2022 13:38:30 -0500 Subject: [PATCH] listen on localhost:0 instead of :0 MacOS's firewall complains about a previously unknown app trying to listen for network connections whenever we run go test. That's because we *are* listening for network connections on arbitrary interfaces, not just on localhost as we probably intended. Fix that. --- ctl/main_test.go | 2 +- etcd/leasedkv_test.go | 2 +- http_handler_test.go | 2 +- main_test.go | 2 +- pg/server_test.go | 8 ++++---- rbf/db_test.go | 2 +- server/cluster_test.go | 2 +- server/server_test.go | 2 +- test/disco.go | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ctl/main_test.go b/ctl/main_test.go index cbd81d2ff..ee27dc16c 100644 --- a/ctl/main_test.go +++ b/ctl/main_test.go @@ -13,7 +13,7 @@ import ( ) func TestMain(m *testing.M) { - l, err := net.Listen("tcp", ":0") + l, err := net.Listen("tcp", "localhost:0") if err != nil { panic(err) } diff --git a/etcd/leasedkv_test.go b/etcd/leasedkv_test.go index e4222764b..2c10f5d26 100644 --- a/etcd/leasedkv_test.go +++ b/etcd/leasedkv_test.go @@ -25,7 +25,7 @@ const newVal = "newValue" // URL, and returns those. Identical to the copy in /test, except we can't // import that because it imports us. func listenerWithURL() (listener *net.TCPListener, url string, err error) { - l, err := net.Listen("tcp", ":0") + l, err := net.Listen("tcp", "localhost:0") if err != nil { return listener, url, err } diff --git a/http_handler_test.go b/http_handler_test.go index 2a213642b..95ddf2934 100644 --- a/http_handler_test.go +++ b/http_handler_test.go @@ -27,7 +27,7 @@ func TestHandlerOptions(t *testing.T) { t.Fatalf("expected error making handler without options, got nil") } - ln, err := net.Listen("tcp", ":0") + ln, err := net.Listen("tcp", "localhost:0") if err != nil { t.Fatalf("creating listener: %v", err) } diff --git a/main_test.go b/main_test.go index 6919a82ae..0201c922a 100644 --- a/main_test.go +++ b/main_test.go @@ -13,7 +13,7 @@ import ( ) func TestMain(m *testing.M) { - l, err := net.Listen("tcp", ":0") + l, err := net.Listen("tcp", "localhost:0") if err != nil { panic(err) } diff --git a/pg/server_test.go b/pg/server_test.go index b2066bbeb..5f5c0d890 100644 --- a/pg/server_test.go +++ b/pg/server_test.go @@ -97,7 +97,7 @@ func TestPQConnect(t *testing.T) { Logger: logger.NopLogger, } - addr, shutdown, err := pgtest.ServeTCP(":0", server) + addr, shutdown, err := pgtest.ServeTCP("localhost:0", server) if err != nil { t.Fatalf("starting postgres server: %v", err) } @@ -129,7 +129,7 @@ func TestPQConnectSSL(t *testing.T) { Logger: logger.NopLogger, } - addr, shutdown, err := pgtest.ServeTLS(":0", server) + addr, shutdown, err := pgtest.ServeTLS("localhost:0", server) if err != nil { t.Fatalf("starting postgres server: %v", err) } @@ -194,7 +194,7 @@ func TestPSQLQuery(t *testing.T) { Logger: logger.NopLogger, } - addr, shutdown, err := pgtest.ServeTCP(":0", server) + addr, shutdown, err := pgtest.ServeTCP("localhost:0", server) if err != nil { t.Fatalf("starting postgres server: %v", err) } @@ -256,7 +256,7 @@ func TestPSQLQuery(t *testing.T) { CancellationManager: pg.NewLocalCancellationManager(rand.Reader), } - addr, shutdown, err := pgtest.ServeTCP(":0", server) + addr, shutdown, err := pgtest.ServeTCP("localhost:0", server) if err != nil { t.Fatalf("starting postgres server: %v", err) } diff --git a/rbf/db_test.go b/rbf/db_test.go index 2b886677c..670545aa7 100644 --- a/rbf/db_test.go +++ b/rbf/db_test.go @@ -583,7 +583,7 @@ func BenchmarkDbCheckpoint(b *testing.B) { // better diagnosis of deadlocks/hung situations versus just really slow "Quick" tests. func TestMain(m *testing.M) { - l, err := net.Listen("tcp", ":0") + l, err := net.Listen("tcp", "localhost:0") if err != nil { panic(err) } diff --git a/server/cluster_test.go b/server/cluster_test.go index 1f021bdf0..14d743465 100644 --- a/server/cluster_test.go +++ b/server/cluster_test.go @@ -155,7 +155,7 @@ func TestClusterResize_AddNode(t *testing.T) { m1 := test.NewCommandNode(t) lsns := make([]*net.TCPListener, 3) for i := range lsns { - l, err := net.Listen("tcp", ":0") + l, err := net.Listen("tcp", "localhost:0") if err != nil { t.Fatal(err) } diff --git a/server/server_test.go b/server/server_test.go index 093e919b5..ba4c26171 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -1043,7 +1043,7 @@ Set("h", adec=100.22) } func TestMain(m *testing.M) { - l, err := net.Listen("tcp", ":0") + l, err := net.Listen("tcp", "localhost:0") if err != nil { panic(err) } diff --git a/test/disco.go b/test/disco.go index abd77e59c..06140598c 100644 --- a/test/disco.go +++ b/test/disco.go @@ -41,7 +41,7 @@ func (ports *Ports) Close() error { // listenerWithURL builds a TCP listener and corresponding http://localhost:%d // URL, and returns those. func listenerWithURL() (listener *net.TCPListener, url string, err error) { - l, err := net.Listen("tcp", ":0") + l, err := net.Listen("tcp", "localhost:0") if err != nil { return listener, url, err }