Skip to content

Commit

Permalink
tests: use const for remote error string output
Browse files Browse the repository at this point in the history
use a const instead of repeating the same string multiple times.
  • Loading branch information
sgotti committed Sep 21, 2023
1 parent b87e2a0 commit a9f9b01
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions tests/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ const (
GroupTypeUsers = "users"
)

const (
remoteErrorBadRequest = "remote error badrequest"
)

func setupGitea(t *testing.T, dir, dockerBridgeAddress string) *testutil.TestGitea {
tgitea, err := testutil.NewTestGitea(t, dir, dockerBridgeAddress)
if err != nil {
Expand Down Expand Up @@ -620,7 +624,7 @@ func TestPasswordRegisterUser(t *testing.T) {
RemoteSourceLoginPassword: giteaUser01Password,
},
})
expectedErr := "remote error badrequest"
expectedErr := remoteErrorBadRequest
if err == nil {
t.Fatalf("expected error %v, got nil err", expectedErr)
}
Expand Down Expand Up @@ -734,7 +738,7 @@ func TestPasswordLogin(t *testing.T) {
// Do an agola call that will use the linkedAccount userAccessToken to call gitea api
// should fails since the registered token has been removed
_, _, err = tokenGWClient.GetUserRemoteRepos(ctx, rs.ID)
expectedErr := "remote error badrequest"
expectedErr := remoteErrorBadRequest
if err == nil {
t.Fatalf("expected error %v, got nil err", expectedErr)
}
Expand Down Expand Up @@ -3409,7 +3413,7 @@ func TestOrgInvitation(t *testing.T) {
orgInvitationEnabled: false,
f: func(ctx context.Context, t *testing.T, tc *testOrgInvitationConfig) {
_, _, err := tc.gwClientUser01.CreateOrgInvitation(ctx, agolaOrg01, &gwapitypes.CreateOrgInvitationRequest{UserRef: agolaUser02, Role: cstypes.MemberRoleMember})
expectedErr := "remote error badrequest"
expectedErr := remoteErrorBadRequest
if err == nil {
t.Fatalf("expected error %v, got nil err", expectedErr)
}
Expand All @@ -3423,7 +3427,7 @@ func TestOrgInvitation(t *testing.T) {
orgInvitationEnabled: true,
f: func(ctx context.Context, t *testing.T, tc *testOrgInvitationConfig) {
_, _, err := tc.gwClientUser01.AddOrgMember(ctx, agolaOrg01, agolaUser02, gwapitypes.MemberRoleMember)
expectedErr := "remote error badrequest"
expectedErr := remoteErrorBadRequest
if err == nil {
t.Fatalf("expected error %v, got nil err", expectedErr)
}
Expand Down Expand Up @@ -3824,7 +3828,7 @@ func TestMaintenance(t *testing.T) {
return true, nil
})

expectedErr := "remote error badrequest"
expectedErr := remoteErrorBadRequest
_, err = gwClient.EnableMaintenance(ctx, configstoreService)
if err == nil {
t.Fatalf("expected error %v, got nil err", expectedErr)
Expand Down Expand Up @@ -3897,7 +3901,7 @@ func TestMaintenance(t *testing.T) {
f: func(ctx context.Context, t *testing.T, sc *setupContext) {
gwClient := gwclient.NewClient(sc.config.Gateway.APIExposedURL, sc.config.Gateway.AdminToken)

expectedErr := "remote error badrequest"
expectedErr := remoteErrorBadRequest
_, err := gwClient.DisableMaintenance(ctx, configstoreService)
if err == nil {
t.Fatalf("expected error %v, got nil err", expectedErr)
Expand All @@ -3920,7 +3924,7 @@ func TestMaintenance(t *testing.T) {
f: func(ctx context.Context, t *testing.T, sc *setupContext) {
gwClient := gwclient.NewClient(sc.config.Gateway.APIExposedURL, sc.config.Gateway.AdminToken)

expectedErr := "remote error badrequest"
expectedErr := remoteErrorBadRequest
_, err := gwClient.EnableMaintenance(ctx, "test")
if err == nil {
t.Fatalf("expected error %v, got nil err", expectedErr)
Expand Down

0 comments on commit a9f9b01

Please # to comment.