Improved kv testing (#13943)

* actually use doer in doTestPluginSaveOrUpdate

* handle off-by-1000ms in KVSetWithOptions

store/storetest/plugin_store.go

@@ -76,7 +76,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, s SqlSupplier, doer
 			ExpireAt: 0,
 		}
 
-		kv, err := ss.Plugin().SaveOrUpdate(kv)
+		kv, err := doer(kv)
 		require.NotNil(t, err)
 		require.Equal(t, "model.plugin_key_value.is_valid.plugin_id.app_error", err.Id)
 		assert.Nil(t, kv)
@@ -97,14 +97,14 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, s SqlSupplier, doer
 			ExpireAt: expireAt,
 		}
 
-		retKV, err := ss.Plugin().SaveOrUpdate(kv)
+		retKV, err := doer(kv)
 		require.Nil(t, err)
 		assert.Equal(t, kv, retKV)
 		// SaveOrUpdate returns the kv passed in, so test each field individually for
 		// completeness. It should probably be changed to not bother doing that.
 		assert.Equal(t, pluginId, kv.PluginId)
 		assert.Equal(t, key, kv.Key)
-		assert.Equal(t, []byte(value), retKV.Value)
+		assert.Equal(t, []byte(value), kv.Value)
 		assert.Equal(t, expireAt, kv.ExpireAt)
 
 		actualKV, err := ss.Plugin().Get(pluginId, key)
@@ -127,16 +127,14 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, s SqlSupplier, doer
 			ExpireAt: expireAt,
 		}
 
-		retKV, err := ss.Plugin().SaveOrUpdate(kv)
-		require.Nil(t, err)
-
+		retKV, err := doer(kv)
 		require.Nil(t, err)
 		assert.Equal(t, kv, retKV)
 		// SaveOrUpdate returns the kv passed in, so test each field individually for
 		// completeness. It should probably be changed to not bother doing that.
 		assert.Equal(t, pluginId, kv.PluginId)
 		assert.Equal(t, key, kv.Key)
-		assert.Nil(t, retKV.Value)
+		assert.Nil(t, kv.Value)
 		assert.Equal(t, expireAt, kv.ExpireAt)
 
 		actualKV, err := ss.Plugin().Get(pluginId, key)
@@ -160,20 +158,20 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, s SqlSupplier, doer
 			ExpireAt: expireAt,
 		}
 
-		_, err := ss.Plugin().SaveOrUpdate(kv)
+		_, err := doer(kv)
 		require.Nil(t, err)
 
 		newValue := model.NewId()
 		kv.Value = []byte(newValue)
-		retKV, err := ss.Plugin().SaveOrUpdate(kv)
 
+		retKV, err := doer(kv)
 		require.Nil(t, err)
 		assert.Equal(t, kv, retKV)
 		// SaveOrUpdate returns the kv passed in, so test each field individually for
 		// completeness. It should probably be changed to not bother doing that.
 		assert.Equal(t, pluginId, kv.PluginId)
 		assert.Equal(t, key, kv.Key)
-		assert.Equal(t, []byte(newValue), retKV.Value)
+		assert.Equal(t, []byte(newValue), kv.Value)
 		assert.Equal(t, expireAt, kv.ExpireAt)
 
 		actualKV, err := ss.Plugin().Get(pluginId, key)
@@ -196,11 +194,11 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, s SqlSupplier, doer
 			ExpireAt: expireAt,
 		}
 
-		_, err := ss.Plugin().SaveOrUpdate(kv)
+		_, err := doer(kv)
 		require.Nil(t, err)
 
 		kv.Value = nil
-		retKV, err := ss.Plugin().SaveOrUpdate(kv)
+		retKV, err := doer(kv)
 
 		require.Nil(t, err)
 		assert.Equal(t, kv, retKV)
@@ -208,7 +206,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, s SqlSupplier, doer
 		// completeness. It should probably be changed to not bother doing that.
 		assert.Equal(t, pluginId, kv.PluginId)
 		assert.Equal(t, key, kv.Key)
-		assert.Nil(t, retKV.Value)
+		assert.Nil(t, kv.Value)
 		assert.Equal(t, expireAt, kv.ExpireAt)
 
 		actualKV, err := ss.Plugin().Get(pluginId, key)
@@ -254,6 +252,18 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, s SqlSupplier, comp
 
 		actualKV, err := ss.Plugin().Get(kv.PluginId, kv.Key)
 		require.Nil(t, err)
+
+		// When tested with KVSetWithOptions, a strict comparison can fail because that
+		// function accepts a relative time and makes its own call to model.GetMillis(),
+		// leading to off-by-one issues. All these tests are written with 15+ second
+		// differences, so allow for an off-by-1000ms in either direction.
+		require.NotNil(t, actualKV)
+
+		expiryDelta := actualKV.ExpireAt - kv.ExpireAt
+		if expiryDelta > -1000 && expiryDelta < 1000 {
+			actualKV.ExpireAt = kv.ExpireAt
+		}
+
 		assert.Equal(t, kv, actualKV)
 	}
 
@@ -695,7 +705,7 @@ func testPluginSetWithOptions(t *testing.T, ss store.Store, s SqlSupplier) {
 		doTestPluginSaveOrUpdate(t, ss, s, func(kv *model.PluginKeyValue) (*model.PluginKeyValue, *model.AppError) {
 			now := model.GetMillis()
 			options := model.PluginKVSetOptions{
-				Atomic: true,
+				Atomic: false,
 			}
 
 			if kv.ExpireAt != 0 {