Skip to content

Commit

Permalink
change from %w to %v (#1095)
Browse files Browse the repository at this point in the history
  • Loading branch information
@upodroid
upodroid committed Jun 9, 2022
1 parent 338cf57 commit 13d56c5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion groups/reconcile_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ func TestReconcileGroups(t *testing.T) {
expectedState = c.desiredState
}
if err = s.isReconciled(expectedState); err != nil {
t.Errorf("reconciliation unsuccessful for case %s: %w", c.desc, err)
t.Errorf("reconciliation unsuccessful for case %s: %v", c.desc, err)
}
}
}
24 changes: 12 additions & 12 deletions groups/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func TestAddOrUpdateGroupMembers(t *testing.T) {

adminSvc, err := NewAdminServiceWithClientAndErrFunc(fakeClient, errFunc)
if err != nil {
t.Errorf("error creating client %w", err)
t.Errorf("error creating client %v", err)
}
err = adminSvc.AddOrUpdateGroupMembers(c.g, c.role, c.members)
if err != nil {
Expand All @@ -188,7 +188,7 @@ func TestAddOrUpdateGroupMembers(t *testing.T) {

result, err := fakeClient.ListMembers(c.g.EmailId)
if err != nil {
t.Errorf("error while listing members for groupKey %s and case %s: %w", c.g.EmailId, c.desc, err)
t.Errorf("error while listing members for groupKey %s and case %s: %v", c.g.EmailId, c.desc, err)
}
if !checkForMemberListEquality(result, c.expectedMembers) {
t.Errorf("unexpected list of members for %s, expected: %#v, got: %#v",
Expand Down Expand Up @@ -250,7 +250,7 @@ func TestCreateOrUpdateGroupIfNescessary(t *testing.T) {

adminSvc, err := NewAdminServiceWithClientAndErrFunc(fakeClient, errFunc)
if err != nil {
t.Errorf("error creating client %w", err)
t.Errorf("error creating client %v", err)
}

err = adminSvc.CreateOrUpdateGroupIfNescessary(c.g)
Expand All @@ -260,7 +260,7 @@ func TestCreateOrUpdateGroupIfNescessary(t *testing.T) {

result, err := fakeClient.ListGroups()
if err != nil {
t.Errorf("error while listing groups for case %s: %w", c.desc, err)
t.Errorf("error while listing groups for case %s: %v", c.desc, err)
}

if !checkForGroupListEquality(result.Groups, c.expectedGroups) {
Expand Down Expand Up @@ -302,7 +302,7 @@ func TestDeleteGroupsIfNecessary(t *testing.T) {

adminSvc, err := NewAdminServiceWithClientAndErrFunc(fakeClient, errFunc)
if err != nil {
t.Errorf("error creating client %w", err)
t.Errorf("error creating client %v", err)
}
groupsConfig.Groups = c.desiredState

Expand All @@ -313,7 +313,7 @@ func TestDeleteGroupsIfNecessary(t *testing.T) {

result, err := fakeClient.ListGroups()
if err != nil {
t.Errorf("error while listing groups for case %s: %w", c.desc, err)
t.Errorf("error while listing groups for case %s: %v", c.desc, err)
}

if !checkForAdminGroupGoogleGroupEquality(result.Groups, c.desiredState) {
Expand Down Expand Up @@ -370,7 +370,7 @@ func TestRemoveOwnerOrManagersFromGroup(t *testing.T) {

adminSvc, err := NewAdminServiceWithClientAndErrFunc(fakeClient, errFunc)
if err != nil {
t.Errorf("error creating client %w", err)
t.Errorf("error creating client %v", err)
}

err = adminSvc.RemoveOwnerOrManagersFromGroup(c.g, c.desiredState)
Expand All @@ -380,7 +380,7 @@ func TestRemoveOwnerOrManagersFromGroup(t *testing.T) {

result, err := fakeClient.ListMembers(c.g.EmailId)
if err != nil {
t.Errorf("error while listing members for groupKey %s and case %s: %w", c.g.EmailId, c.desc, err)
t.Errorf("error while listing members for groupKey %s and case %s: %v", c.g.EmailId, c.desc, err)
}

if !checkForMemberListEquality(result, c.expectedMembers) {
Expand Down Expand Up @@ -436,7 +436,7 @@ func TestRemoveMembersFromGroup(t *testing.T) {

adminSvc, err := NewAdminServiceWithClientAndErrFunc(fakeClient, errFunc)
if err != nil {
t.Errorf("error creating client %w", err)
t.Errorf("error creating client %v", err)
}

err = adminSvc.RemoveMembersFromGroup(c.g, c.desiredState)
Expand All @@ -446,7 +446,7 @@ func TestRemoveMembersFromGroup(t *testing.T) {

result, err := fakeClient.ListMembers(c.g.EmailId)
if err != nil {
t.Errorf("error while listing members for groupKey %s and case %s: %w", c.g.EmailId, c.desc, err)
t.Errorf("error while listing members for groupKey %s and case %s: %v", c.g.EmailId, c.desc, err)
}

if !checkForMemberListEquality(result, c.expectedMembers) {
Expand Down Expand Up @@ -552,7 +552,7 @@ func TestUpdateGroupSettings(t *testing.T) {

groupSvc, err := NewGroupServiceWithClientAndErrFunc(fakeClient, errFunc)
if err != nil {
t.Errorf("error creating client %w", err)
t.Errorf("error creating client %v", err)
}

err = groupSvc.UpdateGroupSettings(c.g)
Expand All @@ -562,7 +562,7 @@ func TestUpdateGroupSettings(t *testing.T) {

result, err := fakeClient.Get(c.g.EmailId)
if err != nil {
t.Errorf("error while getting groupsettings of group with groupKey %s: %w", c.g.EmailId, err)
t.Errorf("error while getting groupsettings of group with groupKey %s: %v", c.g.EmailId, err)
}

if !reflect.DeepEqual(result, c.expectedSettings) {
Expand Down

0 comments on commit 13d56c5

Please sign in to comment.