diff options
Diffstat (limited to 'internal/service/conflicts/testhelper_test.go')
| -rw-r--r-- | internal/service/conflicts/testhelper_test.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/internal/service/conflicts/testhelper_test.go b/internal/service/conflicts/testhelper_test.go index e58298096..713a971b8 100644 --- a/internal/service/conflicts/testhelper_test.go +++ b/internal/service/conflicts/testhelper_test.go @@ -4,7 +4,6 @@ import ( "net" "os" "testing" - "time" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" @@ -49,15 +48,12 @@ func runConflictsServer(t *testing.T) (*grpc.Server, string) { go server.Serve(listener) - return server, serverSocketPath + return server, "unix://" + serverSocketPath } func NewConflictsClient(t *testing.T, serverSocketPath string) (gitalypb.ConflictsServiceClient, *grpc.ClientConn) { connOpts := []grpc.DialOption{ grpc.WithInsecure(), - grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) { - return net.DialTimeout("unix", addr, timeout) - }), } conn, err := grpc.Dial(serverSocketPath, connOpts...) |