From d356ef349b515ef54951bc897381c28a6556bf85 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Tue, 12 Jan 2021 19:45:17 +0530
Subject: [PATCH] MM-31876: Fix racy test GetReplica (#16656)

Automatic Merge
---
 store/sqlstore/store_test.go | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go
index 29ec588778..d599f6c66d 100644
--- a/store/sqlstore/store_test.go
+++ b/store/sqlstore/store_test.go
@@ -268,13 +268,13 @@ func TestGetReplica(t *testing.T) {
 				assert.Len(t, replicas, len(testCase.DataSourceReplicas))
 
 				for replica := range replicas {
-					assert.NotEqual(t, store.GetMaster(), replica)
+					assert.NotSame(t, store.GetMaster(), replica)
 				}
 
 			} else if assert.Len(t, replicas, 1) {
 				// Otherwise ensure the replicas contains only the master.
 				for replica := range replicas {
-					assert.Equal(t, store.GetMaster(), replica)
+					assert.Same(t, store.GetMaster(), replica)
 				}
 			}
 
@@ -283,20 +283,20 @@ func TestGetReplica(t *testing.T) {
 				assert.Len(t, searchReplicas, len(testCase.DataSourceSearchReplicas))
 
 				for searchReplica := range searchReplicas {
-					assert.NotEqual(t, store.GetMaster(), searchReplica)
+					assert.NotSame(t, store.GetMaster(), searchReplica)
 					for replica := range replicas {
-						assert.NotEqual(t, searchReplica, replica)
+						assert.NotSame(t, searchReplica, replica)
 					}
 				}
-
 			} else if len(testCase.DataSourceReplicas) > 0 {
-				// If no search replicas were defined, but replicas were, ensure they are equal.
-				assert.Equal(t, replicas, searchReplicas)
-
-			} else if assert.Len(t, searchReplicas, 1) {
+				assert.Equal(t, len(replicas), len(searchReplicas))
+				for k := range replicas {
+					assert.True(t, searchReplicas[k])
+				}
+			} else if len(testCase.DataSourceReplicas) == 0 && assert.Len(t, searchReplicas, 1) {
 				// Otherwise ensure the search replicas contains the master.
 				for searchReplica := range searchReplicas {
-					assert.Equal(t, store.GetMaster(), searchReplica)
+					assert.Same(t, store.GetMaster(), searchReplica)
 				}
 			}
 		})
@@ -330,7 +330,7 @@ func TestGetReplica(t *testing.T) {
 			} else if assert.Len(t, replicas, 1) {
 				// Otherwise ensure the replicas contains only the master.
 				for replica := range replicas {
-					assert.Equal(t, store.GetMaster(), replica)
+					assert.Same(t, store.GetMaster(), replica)
 				}
 			}
 
@@ -343,13 +343,14 @@ func TestGetReplica(t *testing.T) {
 				}
 
 			} else if len(testCase.DataSourceReplicas) > 0 {
-				// If no search replicas were defined, but replicas were, ensure they are equal.
-				assert.Equal(t, replicas, searchReplicas)
-
+				assert.Equal(t, len(replicas), len(searchReplicas))
+				for k := range replicas {
+					assert.True(t, searchReplicas[k])
+				}
 			} else if assert.Len(t, searchReplicas, 1) {
 				// Otherwise ensure the search replicas contains the master.
 				for searchReplica := range searchReplicas {
-					assert.Equal(t, store.GetMaster(), searchReplica)
+					assert.Same(t, store.GetMaster(), searchReplica)
 				}
 			}
 		})