From f226f672f3285fed8dfc70a8b2ec4acd9c8c8bed Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Mon, 29 Jul 2019 11:18:37 -0300
Subject: [PATCH] MM-17235: fix flaky TestChannelStore tests (#11715)

Address more model.GetMillis() races.
---
 store/storetest/channel_store.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go
index e6a1262fe8..336a6ed963 100644
--- a/store/storetest/channel_store.go
+++ b/store/storetest/channel_store.go
@@ -762,31 +762,26 @@ func testChannelStoreGetByNames(t *testing.T, ss store.Store) {
 }
 
 func testChannelStoreGetDeletedByName(t *testing.T, ss store.Store) {
-	o1 := model.Channel{}
+	o1 := &model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Name"
 	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
-	_, err := ss.Channel().Save(&o1, -1)
+	_, err := ss.Channel().Save(o1, -1)
 	require.Nil(t, err)
 
 	now := model.GetMillis()
-	err = ss.Channel().Delete(o1.Id, model.GetMillis())
+	err = ss.Channel().Delete(o1.Id, now)
 	require.Nil(t, err, "channel should have been deleted")
 	o1.DeleteAt = now
 	o1.UpdateAt = now
 
-	if r1, err := ss.Channel().GetDeletedByName(o1.TeamId, o1.Name); err != nil {
-		t.Fatal(err)
-	} else {
-		if r1.ToJson() != o1.ToJson() {
-			t.Fatal("invalid returned channel")
-		}
-	}
+	r1, err := ss.Channel().GetDeletedByName(o1.TeamId, o1.Name)
+	require.Nil(t, err)
+	require.Equal(t, o1, r1)
 
-	if _, err := ss.Channel().GetDeletedByName(o1.TeamId, ""); err == nil {
-		t.Fatal("Missing id should have failed")
-	}
+	_, err = ss.Channel().GetDeletedByName(o1.TeamId, "")
+	require.NotNil(t, err, "missing id should have failed")
 }
 
 func testChannelStoreGetDeleted(t *testing.T, ss store.Store) {
@@ -2352,7 +2347,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) {
 
 	o10.DeleteAt = model.GetMillis()
 	o10.UpdateAt = o10.DeleteAt
-	err = ss.Channel().Delete(o10.Id, model.GetMillis())
+	err = ss.Channel().Delete(o10.Id, o10.DeleteAt)
 	require.Nil(t, err, "channel should have been deleted")
 
 	t.Run("three public channels matching 'ChannelA', but already a member of one and one deleted", func(t *testing.T) {
@@ -2547,7 +2542,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) {
 	require.Nil(t, err)
 	o13.DeleteAt = model.GetMillis()
 	o13.UpdateAt = o13.DeleteAt
-	err = ss.Channel().Delete(o13.Id, model.GetMillis())
+	err = ss.Channel().Delete(o13.Id, o13.DeleteAt)
 	require.Nil(t, err, "channel should have been deleted")
 
 	testCases := []struct {