From f93d6d56871e15024c1f9f4b3c5194ccbc83dd94 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Thu, 7 Apr 2022 19:21:06 +0530
Subject: [PATCH] MM-43137: Fix racy test TestUpdateActiveBotsSideEffect
 (#19935)

This was introduced with https://github.com/mattermost/mattermost-server/commit/2e027ae9278d60f318e7c286fcbe5c88895cc23f.

We fix it by deep copying the user struct before returning from store.

https://mattermost.atlassian.net/browse/MM-43137

```release-note
NONE
```
---
 store/sqlstore/user_store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go
index de2e9ee444..5b010200fe 100644
--- a/store/sqlstore/user_store.go
+++ b/store/sqlstore/user_store.go
@@ -224,7 +224,7 @@ func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) (*model.
 
 	user.Sanitize(map[string]bool{})
 	oldUser.Sanitize(map[string]bool{})
-	return &model.UserUpdate{New: user, Old: &oldUser}, nil
+	return &model.UserUpdate{New: user.DeepCopy(), Old: &oldUser}, nil
 }
 
 func (us SqlUserStore) UpdateNotifyProps(userID string, props map[string]string) error {