Fix failing ServerInUseHostPort test on MacOS

cmd/query/app/server.go

@@ -74,7 +74,7 @@ func NewServer(logger *zap.Logger, querySvc *querysvc.QueryService, options *Que
 		tracer:             tracer,
 		grpcServer:         grpcServer,
 		httpServer:         createHTTPServer(querySvc, options, tracer, logger),
-		separatePorts:      (grpcPort != httpPort),
+		separatePorts:      grpcPort != httpPort,
 		unavailableChannel: make(chan healthcheck.Status),
 	}, nil
 }

cmd/query/app/server_test.go

@@ -24,6 +24,7 @@ import (
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest/observer"
 
@@ -73,28 +74,44 @@ func TestServerBadHostPort(t *testing.T) {
 }
 
 func TestServerInUseHostPort(t *testing.T) {
-
-	for _, hostPort := range [2]string{":8080", ":8081"} {
-		conn, err := net.Listen("tcp", hostPort)
-		assert.NoError(t, err)
-
-		server, err := NewServer(zap.NewNop(), &querysvc.QueryService{},
-			&QueryOptions{HTTPHostPort: "127.0.0.1:8080", GRPCHostPort: "127.0.0.1:8081", BearerTokenPropagation: true},
-			opentracing.NoopTracer{})
-		assert.NoError(t, err)
-
-		err = server.Start()
-		assert.NotNil(t, err)
-		conn.Close()
-		if server.grpcConn != nil {
-			server.grpcConn.Close()
-		}
-		if server.httpConn != nil {
-			server.httpConn.Close()
-		}
-
+	const availableHostPort = "127.0.0.1:0"
+	conn, err := net.Listen("tcp", availableHostPort)
+	require.NoError(t, err)
+	defer func() { require.NoError(t, conn.Close()) }()
+
+	testCases := []struct {
+		name         string
+		httpHostPort string
+		grpcHostPort string
+	}{
+		{"HTTP host port clash", conn.Addr().String(), availableHostPort},
+		{"GRPC host port clash", availableHostPort, conn.Addr().String()},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			server, err := NewServer(
+				zap.NewNop(),
+				&querysvc.QueryService{},
+				&QueryOptions{
+					HTTPHostPort:           tc.httpHostPort,
+					GRPCHostPort:           tc.grpcHostPort,
+					BearerTokenPropagation: true,
+				},
+				opentracing.NoopTracer{},
+			)
+			assert.NoError(t, err)
+
+			err = server.Start()
+			assert.Error(t, err)
+
+			if server.grpcConn != nil {
+				server.grpcConn.Close()
+			}
+			if server.httpConn != nil {
+				server.httpConn.Close()
+			}
+		})
 	}
-
 }
 
 func TestServer(t *testing.T) {