diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2020-03-11 16:58:28 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2020-03-11 16:58:28 +0300 |
| commit | ba87ebb6a005d31b23434dd40ab5eeb8df725d0f (patch) | |
| tree | c1145bcf4a151db285947fcfaa13763e9679d4b3 | |
| parent | 778cc7245a367c73d8a8854385cc8014319fdc0b (diff) | |
| parent | e394ca7231d62257388bfdf80f6d7562b3d30966 (diff) | |
Merge branch 'jv-fix-2534' into 'master'
Fix broken test build in internal/service/repository
Closes #2534
See merge request gitlab-org/gitaly!1909
| -rw-r--r-- | internal/service/repository/fetch_remote_test.go | 3 | ||||
| -rw-r--r-- | internal/service/repository/search_files_test.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/internal/service/repository/fetch_remote_test.go b/internal/service/repository/fetch_remote_test.go index 56947c5d3..5f6cce28d 100644 --- a/internal/service/repository/fetch_remote_test.go +++ b/internal/service/repository/fetch_remote_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "gitlab.com/gitlab-org/gitaly/internal/config" "gitlab.com/gitlab-org/gitaly/internal/helper" "gitlab.com/gitlab-org/gitaly/internal/testhelper" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" @@ -67,7 +68,7 @@ func TestFetchRemoteSuccess(t *testing.T) { } func TestFetchRemoteFailure(t *testing.T) { - server := NewServer(RubyServer) + server := NewServer(RubyServer, config.GitalyInternalSocketPath()) tests := []struct { desc string diff --git a/internal/service/repository/search_files_test.go b/internal/service/repository/search_files_test.go index 528aaa7ed..3aa5204d2 100644 --- a/internal/service/repository/search_files_test.go +++ b/internal/service/repository/search_files_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "gitlab.com/gitlab-org/gitaly/internal/config" "gitlab.com/gitlab-org/gitaly/internal/testhelper" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc/codes" @@ -208,7 +209,7 @@ func TestSearchFilesByContentLargeFile(t *testing.T) { } func TestSearchFilesByContentFailure(t *testing.T) { - server := NewServer(RubyServer) + server := NewServer(RubyServer, config.GitalyInternalSocketPath()) testRepo, _, cleanupRepo := testhelper.NewTestRepo(t) defer cleanupRepo() |