diff options
Diffstat (limited to 'internal/gitaly/service/operations/squash_test.go')
| -rw-r--r-- | internal/gitaly/service/operations/squash_test.go | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/internal/gitaly/service/operations/squash_test.go b/internal/gitaly/service/operations/squash_test.go index f890a4510..58d3a11ad 100644 --- a/internal/gitaly/service/operations/squash_test.go +++ b/internal/gitaly/service/operations/squash_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/internal/helper/text" "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" "gitlab.com/gitlab-org/gitaly/internal/testhelper" @@ -47,8 +46,6 @@ func TestSuccessfulUserSquashRequest(t *testing.T) { } func testSuccessfulUserSquashRequest(t *testing.T, ctx context.Context, start, end string) { - locator := config.NewLocator(config.Config) - serverSocketPath, stop := runOperationServiceServer(t) defer stop() @@ -72,7 +69,7 @@ func testSuccessfulUserSquashRequest(t *testing.T, ctx context.Context, start, e require.NoError(t, err) require.Empty(t, response.GetGitError()) - commit, err := log.GetCommit(ctx, locator, testRepo, response.SquashSha) + commit, err := log.GetCommit(ctx, testRepo, response.SquashSha) require.NoError(t, err) require.Equal(t, []string{start}, commit.ParentIds) require.Equal(t, author.Name, commit.Author.Name) @@ -103,8 +100,6 @@ func TestSuccessfulUserSquashRequestWith3wayMerge(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - locator := config.NewLocator(config.Config) - serverSocketPath, stop := runOperationServiceServer(t) defer stop() @@ -129,7 +124,7 @@ func TestSuccessfulUserSquashRequestWith3wayMerge(t *testing.T) { require.NoError(t, err) require.Empty(t, response.GetGitError()) - commit, err := log.GetCommit(ctx, locator, testRepo, response.SquashSha) + commit, err := log.GetCommit(ctx, testRepo, response.SquashSha) require.NoError(t, err) require.Equal(t, []string{"6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"}, commit.ParentIds) require.Equal(t, author.Name, commit.Author.Name) @@ -188,8 +183,6 @@ func TestSquashRequestWithRenamedFiles(t *testing.T) { ctx, cancel := testhelper.Context() defer cancel() - locator := config.NewLocator(config.Config) - serverSocketPath, stop := runOperationServiceServer(t) defer stop() @@ -238,7 +231,7 @@ func TestSquashRequestWithRenamedFiles(t *testing.T) { require.NoError(t, err) require.Empty(t, response.GetGitError()) - commit, err := log.GetCommit(ctx, locator, testRepo, response.SquashSha) + commit, err := log.GetCommit(ctx, testRepo, response.SquashSha) require.NoError(t, err) require.Equal(t, []string{startCommitID}, commit.ParentIds) require.Equal(t, author.Name, commit.Author.Name) |