From 4225977966cf0855c8a5e55f8a0fef702b19dc18 Mon Sep 17 00:00:00 2001
From: Eli Yukelzon <reflog@gmail.com>
Date: Wed, 16 Oct 2019 12:55:36 +0300
Subject: [PATCH] =?UTF-8?q?MM-19154=20-=20Fix=20flaky=20test=20TestGroupSt?=
 =?UTF-8?q?ore/MySQL/GetGroups/Get=5Fg=E2=80=A6=20(#12705)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 store/storetest/group_store.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/store/storetest/group_store.go b/store/storetest/group_store.go
index 89ad1c7e7b..11afeb3fe8 100644
--- a/store/storetest/group_store.go
+++ b/store/storetest/group_store.go
@@ -2018,7 +2018,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 	require.Nil(t, err)
 
 	group2, err := ss.Group().Create(&model.Group{
-		Name:        model.NewId(),
+		Name:        model.NewId() + "-group-2",
 		DisplayName: "group-2",
 		RemoteId:    model.NewId(),
 		Source:      model.GroupSourceLdap,
@@ -2062,7 +2062,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 
 	// Create Group3
 	group3, err := ss.Group().Create(&model.Group{
-		Name:        model.NewId(),
+		Name:        model.NewId() + "-group-3",
 		DisplayName: "group-3",
 		RemoteId:    model.NewId(),
 		Source:      model.GroupSourceLdap,
@@ -2122,7 +2122,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 	user2.DeleteAt = 1
 	ss.User().Update(user2, true)
 
-	group2NameSubstring := string([]rune(group2.Name)[2:5])
+	group2NameSubstring := "group-2"
 
 	testCases := []struct {
 		Name    string