opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

MM-18006: Fix flaky test CreateOrRestoreGroupMember (#14955)

Browse Source 
Updating a Group or a GroupMember only changed the UpdateAt or CreateAt times
respectively. And it threw an error if number of rows changed was not 1.

However, it can happen that 2 calls happen so fast that 1 milisecond does not pass,
or even 2 concurrent calls at the same time might happen so that model.GetMillis
return the same timestamp. In those cases, the number of rows updated can be 0.

The error should just check if the number is greater than 1, instead of not equal to 1.
This makes it more robust and correct.

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Agniva De Sarker
2020-07-18 09:57:58 +05:30
committed by GitHub
co-authored by Mattermod
parent 9805a594dd
commit 3f46cf6f60
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
i18n/en.json
+4 -4
View File
@@ -6727,12 +6727,12 @@
"translation": "group syncable was already deleted"
},
{
"id": "store.sql_group.no_rows",
"translation": "no matching group found"
"id": "store.sql_group.more_than_one_row_changed",
"translation": "More than one row changed."
},
{
"id": "store.sql_group.no_rows_changed",
"translation": "no rows changed"
"id": "store.sql_group.no_rows",
"translation": "no matching group found"
},
{
"id": "store.sql_group.permanent_delete_members_by_user.app_error",
store/sqlstore/group_store.go
+4 -4
View File
@@ -232,8 +232,8 @@ func (s *SqlGroupStore) Update(group *model.Group) (*model.Group, *model.AppErro
}
return nil, model.NewAppError("SqlGroupStore.GroupUpdate", "store.update_error", nil, err.Error(), http.StatusInternalServerError)
}
if rowsChanged != 1 {
return nil, model.NewAppError("SqlGroupStore.GroupUpdate", "store.sql_group.no_rows_changed", nil, "", http.StatusInternalServerError)
if rowsChanged > 1 {
return nil, model.NewAppError("SqlGroupStore.GroupUpdate", "store.sql_group.more_than_one_row_changed", nil, "", http.StatusInternalServerError)
}
return group, nil
@@ -427,8 +427,8 @@ func (s *SqlGroupStore) UpsertMember(groupID string, userID string) (*model.Grou
if rowsChanged, err = s.GetMaster().Update(member); err != nil {
return nil, model.NewAppError("SqlGroupStore.GroupCreateOrRestoreMember", "store.update_error", nil, "group_id="+member.GroupId+", user_id="+member.UserId+", "+err.Error(), http.StatusInternalServerError)
}
if rowsChanged != 1 {
return nil, model.NewAppError("SqlGroupStore.GroupCreateOrRestoreMember", "store.sql_group.no_rows_changed", nil, "", http.StatusInternalServerError)
if rowsChanged > 1 {
return nil, model.NewAppError("SqlGroupStore.GroupCreateOrRestoreMember", "store.sql_group.more_than_one_row_changed", nil, "", http.StatusInternalServerError)
}
}