Go: Fix Full Matrix Tests (valkey-io#4079)

Author: edlng

go/integTest/batch_test.go

@@ -8,6 +8,7 @@ import (
 	"reflect"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
@@ -41,6 +42,9 @@ func (suite *GlideTestSuite) TestBatchTimeout() {
 			_, err := c.ExecWithOptions(context.Background(), *batch, true, *opts)
 			suite.Error(err)
 			suite.IsType(&errors.TimeoutError{}, err)
+
+			time.Sleep(1 * time.Second)
+
 			// Retry with a longer timeout and expect [OK]
 			opts.WithTimeout(1000)
 			res, err := c.ExecWithOptions(context.Background(), *batch, true, *opts)
@@ -53,6 +57,9 @@ func (suite *GlideTestSuite) TestBatchTimeout() {
 			_, err := c.ExecWithOptions(context.Background(), *batch, true, *opts)
 			suite.Error(err)
 			suite.IsType(&errors.TimeoutError{}, err)
+
+			time.Sleep(1 * time.Second)
+
 			// Retry with a longer timeout and expect [OK]
 			opts.WithTimeout(1000)
 			res, err := c.ExecWithOptions(context.Background(), *batch, true, *opts)

go/integTest/cluster_commands_test.go

@@ -2422,27 +2422,12 @@ func (suite *GlideTestSuite) TestScriptKillWithoutRoute() {
 	require.NoError(suite.T(), err)
 	killClient := suite.defaultClusterClient()
 
-	// Ensure no script is running at the beginning
-	_, err = killClient.ScriptKill(context.Background())
-	assert.Error(suite.T(), err)
-	assert.True(suite.T(), strings.Contains(strings.ToLower(err.Error()), "notbusy"))
-
-	// Kill Running Code
-	code := CreateLongRunningLuaScript(5, true)
-	script := options.NewScript(code)
-
-	go invokeClient.InvokeScript(context.Background(), *script)
-
-	time.Sleep(1 * time.Second)
-
-	result, err := killClient.ScriptKill(context.Background())
+	// Flush before setup
+	result, err := invokeClient.ScriptFlush(context.Background())
 	assert.NoError(suite.T(), err)
 	assert.Equal(suite.T(), "OK", result)
-	script.Close()
-
-	time.Sleep(1 * time.Second)
 
-	// Ensure no script is running at the end
+	// Nothing loaded, nothing to kill
 	_, err = killClient.ScriptKill(context.Background())
 	assert.Error(suite.T(), err)
 	assert.True(suite.T(), strings.Contains(strings.ToLower(err.Error()), "notbusy"))
@@ -2503,15 +2488,15 @@ func (suite *GlideTestSuite) TestScriptKillUnkillableWithoutRoute() {
 
 	go invokeClient.InvokeScriptWithOptions(context.Background(), *script, *options.NewScriptOptions().WithKeys([]string{key}))
 
-	time.Sleep(1 * time.Second)
+	time.Sleep(3 * time.Second)
 
 	_, err = killClient.ScriptKill(context.Background())
 	assert.Error(suite.T(), err)
 	assert.True(suite.T(), strings.Contains(strings.ToLower(err.Error()), "unkillable"))
 	script.Close()
 
 	// Wait until script finishes
-	time.Sleep(6 * time.Second)
+	time.Sleep(4 * time.Second)
 
 	// Ensure no script is running at the end
 	_, err = killClient.ScriptKill(context.Background())