fix(test): revert to previous rand.Seed

ClickHouse · Feb 27, 2025 · 85ca9fc · 85ca9fc
1 parent d6ad120
commit 85ca9fc
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/examples/clickhouse_api/main_test.go b/examples/clickhouse_api/main_test.go
@@ -20,20 +20,17 @@ package clickhouse_api
 import (
 	"context"
 	"fmt"
-	"math/rand"
+	clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests"
+	"github.com/stretchr/testify/require"
 	"os"
 	"strconv"
 	"testing"
-	"time"
-
-	clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests"
-	"github.com/stretchr/testify/require"
 )
 
 func TestMain(m *testing.M) {
-	seed := time.Now().UnixNano()
-	fmt.Printf("using random seed %d for %s tests\n", seed, TestSet)
-	rand.Seed(seed)
+	ResetRandSeed()
+	fmt.Printf("using random seed %d for %s tests\n", randSeed, TestSet)
+
 	useDocker, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_DOCKER", "true"))
 	if err != nil {
 		panic(err)

diff --git a/examples/clickhouse_api/multi_host.go b/examples/clickhouse_api/multi_host.go
@@ -19,8 +19,9 @@ package clickhouse_api
 
 import (
 	"fmt"
-	"github.com/ClickHouse/clickhouse-go/v2"
 	"math/rand"
+
+	"github.com/ClickHouse/clickhouse-go/v2"
 )
 
 func MultiHostVersion() error {
@@ -34,6 +35,7 @@ func MultiHostRoundRobinVersion() error {
 
 func MultiHostRandomVersion() error {
 	rand.Seed(85206178671753423)
+	defer ResetRandSeed()
 	connOpenStrategy := clickhouse.ConnOpenRandom
 	return multiHostVersion(&connOpenStrategy)
 }

diff --git a/examples/clickhouse_api/utils.go b/examples/clickhouse_api/utils.go
@@ -22,6 +22,8 @@ import (
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests"
+	"math/rand"
+	"time"
 )
 
 const TestSet string = "examples_clickhouse_api"
@@ -41,3 +43,9 @@ func GetNativeConnectionWithOptions(settings clickhouse.Settings, tlsConfig *tls
 func CheckMinServerVersion(conn driver.Conn, major, minor, patch uint64) bool {
 	return clickhouse_tests.CheckMinServerServerVersion(conn, major, minor, patch)
 }
+
+var randSeed = time.Now().UnixNano()
+
+func ResetRandSeed() {
+	rand.Seed(randSeed)
+}
diff --git a/tests/conn_test.go b/tests/conn_test.go
@@ -76,8 +76,8 @@ func TestConnFailoverRoundRobin(t *testing.T) {
 }
 
 func TestConnFailoverRandom(t *testing.T) {
-	// TODO: find better way to make test deterministic
 	rand.Seed(85206178671753423)
+	defer ResetRandSeed()
 	testConnFailover(t, clickhouse.ConnOpenRandom)
 }
 

diff --git a/tests/std/conn_test.go b/tests/std/conn_test.go
@@ -60,8 +60,8 @@ func TestStdConnFailoverRoundRobin(t *testing.T) {
 }
 
 func TestStdConnFailoverRandom(t *testing.T) {
-	// TODO: find better way to make test deterministic
 	rand.Seed(85206178671753423)
+	defer clickhouse_tests.ResetRandSeed()
 	testStdConnFailover(t, "random")
 }
 

diff --git a/tests/utils.go b/tests/utils.go
@@ -53,6 +53,7 @@ import (
 
 var testUUID = uuid.NewString()[0:12]
 var testTimestamp = time.Now().UnixMilli()
+var randSeed = time.Now().UnixNano()
 
 const defaultClickHouseVersion = "latest"
 
@@ -787,10 +788,13 @@ func OptionsToDSN(o *clickhouse.Options) string {
 	return u.String()
 }
 
+func ResetRandSeed() {
+	rand.Seed(randSeed)
+}
+
 func Runtime(m *testing.M, ts string) (exitCode int) {
-	seed := time.Now().UnixNano()
-	rand.Seed(seed)
-	fmt.Printf("using random seed %d for %s tests\n", seed, ts)
+	ResetRandSeed()
+	fmt.Printf("using random seed %d for %s tests\n", randSeed, ts)
 
 	useDocker, err := strconv.ParseBool(GetEnv("CLICKHOUSE_USE_DOCKER", "true"))
 	if err != nil {