diff options
author | Paul Okstad <pokstad@gitlab.com> | 2020-09-19 00:54:16 +0300 |
---|---|---|
committer | Paul Okstad <pokstad@gitlab.com> | 2020-09-19 00:54:16 +0300 |
commit | e7fa1346bf5a62362e202386e0a062e3f91c29d2 (patch) | |
tree | 80ea5274c69e61afdf56475dc2d5ae629f6cc320 /internal/praefect | |
parent | 8d14377ab5b3914033f85ec3572e0ba65749a6e0 (diff) | |
parent | 85879c280f2f02326c3b8c2ed0befe9f8ca9bdf5 (diff) |
Merge branch 'smh-listen-on-localhost' into 'master'
Listen on localhost in tests
See merge request gitlab-org/gitaly!2573
Diffstat (limited to 'internal/praefect')
-rw-r--r-- | internal/praefect/helper_test.go | 2 | ||||
-rw-r--r-- | internal/praefect/server_factory_test.go | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/internal/praefect/helper_test.go b/internal/praefect/helper_test.go index 10f3aec4a..499df18d8 100644 --- a/internal/praefect/helper_test.go +++ b/internal/praefect/helper_test.go @@ -331,7 +331,7 @@ func mustLoadProtoReg(t testing.TB) *descriptor.FileDescriptorProto { } func listenAvailPort(tb testing.TB) (net.Listener, int) { - listener, err := net.Listen("tcp", ":0") + listener, err := net.Listen("tcp", "localhost:0") require.NoError(tb, err) return listener, listener.Addr().(*net.TCPAddr).Port diff --git a/internal/praefect/server_factory_test.go b/internal/praefect/server_factory_test.go index 158d2c3d4..5c57aaef2 100644 --- a/internal/praefect/server_factory_test.go +++ b/internal/praefect/server_factory_test.go @@ -33,7 +33,7 @@ func TestServerFactory(t *testing.T) { defer gitalyServerFactory.Stop() // start gitaly serving on public endpoint - gitalyListener, err := net.Listen(starter.TCP, ":0") + gitalyListener, err := net.Listen(starter.TCP, "localhost:0") require.NoError(t, err) defer func() { require.NoError(t, gitalyListener.Close()) }() go gitalyServerFactory.Serve(gitalyListener, false) @@ -118,7 +118,7 @@ func TestServerFactory(t *testing.T) { praefectServerFactory := NewServerFactory(conf, logger, coordinator.StreamDirector, nodeMgr, txMgr, queue, rs, registry) defer praefectServerFactory.Stop() - listener, err := net.Listen(starter.TCP, ":0") + listener, err := net.Listen(starter.TCP, "localhost:0") require.NoError(t, err) defer func() { require.NoError(t, listener.Close()) }() @@ -147,7 +147,7 @@ func TestServerFactory(t *testing.T) { praefectServerFactory := NewServerFactory(conf, logger, coordinator.StreamDirector, nodeMgr, txMgr, queue, rs, registry) defer praefectServerFactory.Stop() - listener, err := net.Listen(starter.TCP, ":0") + listener, err := net.Listen(starter.TCP, "localhost:0") require.NoError(t, err) defer func() { require.NoError(t, listener.Close()) }() @@ -187,7 +187,7 @@ func TestServerFactory(t *testing.T) { defer praefectServerFactory.Stop() // start with tcp address - tcpListener, err := net.Listen(starter.TCP, ":0") + tcpListener, err := net.Listen(starter.TCP, "localhost:0") require.NoError(t, err) defer tcpListener.Close() @@ -203,7 +203,7 @@ func TestServerFactory(t *testing.T) { tcpHealthClient := checkOwnRegisteredServices(ctx, t, tcpCC) // start with tls address - tlsListener, err := net.Listen(starter.TCP, ":0") + tlsListener, err := net.Listen(starter.TCP, "localhost:0") require.NoError(t, err) defer tlsListener.Close() |