diff options
Diffstat (limited to 'internal/gitaly/service/operations/revert_test.go')
| -rw-r--r-- | internal/gitaly/service/operations/revert_test.go | 118 |
1 files changed, 24 insertions, 94 deletions
diff --git a/internal/gitaly/service/operations/revert_test.go b/internal/gitaly/service/operations/revert_test.go index 754bf0748..225669662 100644 --- a/internal/gitaly/service/operations/revert_test.go +++ b/internal/gitaly/service/operations/revert_test.go @@ -19,8 +19,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -429,7 +427,6 @@ func TestServer_UserRevert_quarantine(t *testing.T) { testhelper.NewFeatureSets( featureflag.GPGSigning, - featureflag.ReturnStructuredErrorsInUserRevert, ).Run(t, testServerUserRevertQuarantine) } @@ -471,22 +468,9 @@ func testServerUserRevertQuarantine(t *testing.T, ctx context.Context) { Message: []byte("Reverting " + revertedCommit.Id), Timestamp: ×tamppb.Timestamp{Seconds: 12345}, }) - if featureflag.ReturnStructuredErrorsInUserRevert.IsEnabled(ctx) { - expectedError := structerr.NewPermissionDenied("revert: custom hook error").WithDetail( - &gitalypb.UserRevertError{ - Error: &gitalypb.UserRevertError_CustomHook{ - CustomHook: &gitalypb.CustomHookError{ - HookType: gitalypb.CustomHookError_HOOK_TYPE_PRERECEIVE, - }, - }, - }) - testhelper.RequireGrpcError(t, expectedError, err) - } else { - require.NoError(t, err) - require.NotNil(t, response) - require.NotEmpty(t, response.PreReceiveError) - - } + require.NoError(t, err) + require.NotNil(t, response) + require.NotEmpty(t, response.PreReceiveError) objectHash, err := repo.ObjectHash(ctx) require.NoError(t, err) @@ -615,7 +599,6 @@ func TestServer_UserRevert_stableID(t *testing.T) { testhelper.NewFeatureSets( featureflag.GPGSigning, - featureflag.ReturnStructuredErrorsInUserRevert, ).Run(t, testServerUserRevertStableID) } @@ -669,10 +652,8 @@ func testServerUserRevertStableID(t *testing.T, ctx context.Context) { "sha256": "28b57208e72bc2317143571997b9cfc444a51b52a43dde1c0282633a2b60de71", }), }, response.BranchUpdate) - if !featureflag.ReturnStructuredErrorsInUserRevert.IsEnabled(ctx) { - require.Empty(t, response.CreateTreeError) - require.Empty(t, response.CreateTreeErrorCode) - } + require.Empty(t, response.CreateTreeError) + require.Empty(t, response.CreateTreeErrorCode) // headCommit is pointed commit after revert headCommit, err := repo.ReadCommit(ctx, git.Revision(git.DefaultBranch)) @@ -714,7 +695,6 @@ func TestServer_UserRevert_successfulIntoEmptyRepo(t *testing.T) { testhelper.NewFeatureSets( featureflag.GPGSigning, - featureflag.ReturnStructuredErrorsInUserRevert, ).Run(t, testServerUserRevertSuccessfulIntoEmptyRepo) } @@ -772,10 +752,8 @@ func testServerUserRevertSuccessfulIntoEmptyRepo(t *testing.T, ctx context.Conte } require.Equal(t, expectedBranchUpdate, response.BranchUpdate) - if !featureflag.ReturnStructuredErrorsInUserRevert.IsEnabled(ctx) { - require.Empty(t, response.CreateTreeError) - require.Empty(t, response.CreateTreeErrorCode) - } + require.Empty(t, response.CreateTreeError) + require.Empty(t, response.CreateTreeErrorCode) require.Equal(t, request.Message, headCommit.Subject) require.Equal(t, revertedCommit.Id, headCommit.ParentIds[0]) gittest.RequireTree(t, cfg, repoPath, response.BranchUpdate.CommitId, @@ -789,7 +767,6 @@ func TestServer_UserRevert_successfulGitHooks(t *testing.T) { testhelper.NewFeatureSets( featureflag.GPGSigning, - featureflag.ReturnStructuredErrorsInUserRevert, ).Run(t, testServerUserRevertSuccessfulGitHooks) } @@ -829,9 +806,7 @@ func testServerUserRevertSuccessfulGitHooks(t *testing.T, ctx context.Context) { response, err := client.UserRevert(ctx, request) require.NoError(t, err) - if !featureflag.ReturnStructuredErrorsInUserRevert.IsEnabled(ctx) { - require.Empty(t, response.PreReceiveError) - } + require.Empty(t, response.PreReceiveError) headCommit, err := repo.ReadCommit(ctx, git.Revision(destinationBranch)) require.NoError(t, err) gittest.RequireTree(t, cfg, repoPath, headCommit.Id, nil) @@ -847,7 +822,6 @@ func TestServer_UserRevert_failedDueToPreReceiveError(t *testing.T) { testhelper.NewFeatureSets( featureflag.GPGSigning, - featureflag.ReturnStructuredErrorsInUserRevert, ).Run(t, testServerUserRevertFailedDueToPreReceiveError) } @@ -885,19 +859,9 @@ func testServerUserRevertFailedDueToPreReceiveError(t *testing.T, ctx context.Co t.Run(hookName, func(t *testing.T) { gittest.WriteCustomHook(t, repoPath, hookName, hookContent) - if featureflag.ReturnStructuredErrorsInUserRevert.IsEnabled(ctx) { - _, err := client.UserRevert(ctx, request) - actualStatus, _ := status.FromError(err) - require.Equal(t, actualStatus.Code(), codes.PermissionDenied) - require.Equal(t, actualStatus.Message(), "revert: custom hook error") - revertError, ok := actualStatus.Details()[0].(*gitalypb.UserRevertError) - require.True(t, ok) - require.Contains(t, revertError.GetCustomHook().String(), "GL_ID="+gittest.TestUser.GlId) - } else { - response, err := client.UserRevert(ctx, request) - require.NoError(t, err) - require.Contains(t, response.PreReceiveError, "GL_ID="+gittest.TestUser.GlId) - } + response, err := client.UserRevert(ctx, request) + require.NoError(t, err) + require.Contains(t, response.PreReceiveError, "GL_ID="+gittest.TestUser.GlId) }) } } @@ -907,7 +871,6 @@ func TestServer_UserRevert_failedDueToCreateTreeErrorConflict(t *testing.T) { testhelper.NewFeatureSets( featureflag.GPGSigning, - featureflag.ReturnStructuredErrorsInUserRevert, ).Run(t, testServerUserRevertFailedDueToCreateTreeErrorConflict) } @@ -954,20 +917,10 @@ func testServerUserRevertFailedDueToCreateTreeErrorConflict(t *testing.T, ctx co Message: []byte("Reverting " + revertedCommit.Id), } - if featureflag.ReturnStructuredErrorsInUserRevert.IsEnabled(ctx) { - _, err = client.UserRevert(ctx, request) - actualStatus, _ := status.FromError(err) - require.Equal(t, actualStatus.Code(), codes.FailedPrecondition) - require.Equal(t, actualStatus.Message(), "revert: there are conflicting files") - revertError, ok := actualStatus.Details()[0].(*gitalypb.UserRevertError) - require.True(t, ok) - require.NotNil(t, revertError.GetMergeConflict()) - } else { - response, err := client.UserRevert(ctx, request) - require.NoError(t, err) - require.NotEmpty(t, response.CreateTreeError) - require.Equal(t, gitalypb.UserRevertResponse_CONFLICT, response.CreateTreeErrorCode) - } + response, err := client.UserRevert(ctx, request) + require.NoError(t, err) + require.NotEmpty(t, response.CreateTreeError) + require.Equal(t, gitalypb.UserRevertResponse_CONFLICT, response.CreateTreeErrorCode) } func TestServer_UserRevert_failedDueToCreateTreeErrorEmpty(t *testing.T) { @@ -975,7 +928,6 @@ func TestServer_UserRevert_failedDueToCreateTreeErrorEmpty(t *testing.T) { testhelper.NewFeatureSets( featureflag.GPGSigning, - featureflag.ReturnStructuredErrorsInUserRevert, ).Run(t, testServerUserRevertFailedDueToCreateTreeErrorEmpty) } @@ -1037,25 +989,13 @@ func testServerUserRevertFailedDueToCreateTreeErrorEmpty(t *testing.T, ctx conte response, err := client.UserRevert(ctx, request) require.NoError(t, err) + require.Empty(t, response.CreateTreeError) + require.Equal(t, gitalypb.UserRevertResponse_NONE, response.CreateTreeErrorCode) - if featureflag.ReturnStructuredErrorsInUserRevert.IsEnabled(ctx) { - _, err = client.UserRevert(ctx, request) - - expectedError := structerr.NewFailedPrecondition("revert: could not apply because the result was empty").WithDetail( - &gitalypb.UserRevertError{ - Error: &gitalypb.UserRevertError_ChangesAlreadyApplied{}, - }) - testhelper.RequireGrpcError(t, expectedError, err) - } else { - require.NoError(t, err) - require.Empty(t, response.CreateTreeError) - require.Equal(t, gitalypb.UserRevertResponse_NONE, response.CreateTreeErrorCode) - - response, err = client.UserRevert(ctx, request) - require.NoError(t, err) - require.NotEmpty(t, response.CreateTreeError) - require.Equal(t, gitalypb.UserRevertResponse_EMPTY, response.CreateTreeErrorCode) - } + response, err = client.UserRevert(ctx, request) + require.NoError(t, err) + require.NotEmpty(t, response.CreateTreeError) + require.Equal(t, gitalypb.UserRevertResponse_EMPTY, response.CreateTreeErrorCode) } func TestServer_UserRevert_failedDueToCommitError(t *testing.T) { @@ -1063,7 +1003,6 @@ func TestServer_UserRevert_failedDueToCommitError(t *testing.T) { testhelper.NewFeatureSets( featureflag.GPGSigning, - featureflag.ReturnStructuredErrorsInUserRevert, ).Run(t, testServerUserRevertFailedDueToCommitError) } @@ -1106,17 +1045,8 @@ func testServerUserRevertFailedDueToCommitError(t *testing.T, ctx context.Contex Message: []byte("Reverting " + revertedCommit.Id), StartBranchName: []byte(sourceBranch), } - response, err := client.UserRevert(ctx, request) - if featureflag.ReturnStructuredErrorsInUserRevert.IsEnabled(ctx) { - actualStatus, _ := status.FromError(err) - require.Equal(t, actualStatus.Code(), codes.FailedPrecondition) - require.Equal(t, actualStatus.Message(), "revert: branch diverged") - revertError, ok := actualStatus.Details()[0].(*gitalypb.UserRevertError) - require.True(t, ok) - require.NotNil(t, revertError.GetNotAncestor()) - } else { - require.NoError(t, err) - require.Equal(t, "Branch diverged", response.CommitError) - } + response, err := client.UserRevert(ctx, request) + require.NoError(t, err) + require.Equal(t, "Branch diverged", response.CommitError) } |