From c4c47e19543f7b2440198d003c94c53c822a41f3 Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Thu, 10 Oct 2024 16:06:47 -0400 Subject: [PATCH] Tests: Listen on `localhost` instead of `0.0.0.0` Closes https://github.com/grafana/dskit/issues/381 The MacOS network dialog is a bit annoying --- kv/memberlist/tcp_transport_test.go | 4 +++- server/server_test.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/kv/memberlist/tcp_transport_test.go b/kv/memberlist/tcp_transport_test.go index 1803c8280..f80bd80bc 100644 --- a/kv/memberlist/tcp_transport_test.go +++ b/kv/memberlist/tcp_transport_test.go @@ -44,7 +44,7 @@ func TestTCPTransport_WriteTo_ShouldNotLogAsWarningExpectedFailures(t *testing.T cfg := TCPTransportConfig{} flagext.DefaultValues(&cfg) - cfg.BindAddrs = []string{"127.0.0.1"} + cfg.BindAddrs = getLocalhostAddrs() cfg.BindPort = 0 if testData.setup != nil { testData.setup(t, &cfg) @@ -88,6 +88,7 @@ func TestTCPTransportWriteToUnreachableAddr(t *testing.T) { cfg := TCPTransportConfig{} flagext.DefaultValues(&cfg) + cfg.BindAddrs = getLocalhostAddrs() cfg.MaxConcurrentWrites = writeCt cfg.PacketDialTimeout = 500 * time.Millisecond transport, err := NewTCPTransport(cfg, logger, nil) @@ -128,6 +129,7 @@ func TestTCPTransportWriterAcquireTimeout(t *testing.T) { cfg := TCPTransportConfig{} flagext.DefaultValues(&cfg) + cfg.BindAddrs = getLocalhostAddrs() cfg.MaxConcurrentWrites = 1 cfg.AcquireWriterTimeout = 1 * time.Millisecond // very short timeout transport, err := NewTCPTransport(cfg, logger, nil) diff --git a/server/server_test.go b/server/server_test.go index f84abaa51..d5390e7aa 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -132,6 +132,8 @@ func TestTCPv4Network(t *testing.T) { func TestDefaultAddresses(t *testing.T) { var cfg Config cfg.RegisterFlags(flag.NewFlagSet("", flag.ExitOnError)) + cfg.GRPCListenAddress = "localhost" + cfg.HTTPListenAddress = "localhost" cfg.HTTPListenPort = 9090 cfg.MetricsNamespace = "testing_addresses" @@ -949,6 +951,8 @@ func TestGrpcOverProxyProtocol(t *testing.T) { cfg.RegisterFlags(flag.NewFlagSet("", flag.ExitOnError)) cfg.ProxyProtocolEnabled = true // Set this to 0 to have it choose a random port + cfg.HTTPListenAddress = "localhost" + cfg.GRPCListenAddress = "localhost" cfg.HTTPListenPort = 0 fakeSourceIP := "1.2.3.4"