From b3dc25fc57346758ee90425e80b2e713b499a180 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Mon, 3 Oct 2022 15:19:59 -0700 Subject: [PATCH] integration-tests/go-sql-server-driver: Move some magic numbers/strings to constants. --- integration-tests/go-sql-server-driver/cmd.go | 14 ++++++++++---- integration-tests/go-sql-server-driver/testdef.go | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/integration-tests/go-sql-server-driver/cmd.go b/integration-tests/go-sql-server-driver/cmd.go index e0461dfb46..06c83e5de1 100644 --- a/integration-tests/go-sql-server-driver/cmd.go +++ b/integration-tests/go-sql-server-driver/cmd.go @@ -31,6 +31,12 @@ import ( var DoltPath string +const TestUserName = "Bats Tests" +const TestEmailAddress = "bats@email.fake" + +const ConnectAttempts = 50 +const RetrySleepDuration = 10 * time.Millisecond + func init() { var err error DoltPath, err = exec.LookPath("dolt") @@ -64,11 +70,11 @@ func NewDoltUser() (DoltUser, error) { if err != nil { return DoltUser{}, err } - err = res.DoltExec("config", "--global", "--add", "user.name", "Bats Tests") + err = res.DoltExec("config", "--global", "--add", "user.name", TestUserName) if err != nil { return DoltUser{}, err } - err = res.DoltExec("config", "--global", "--add", "user.email", "bats@email.fake") + err = res.DoltExec("config", "--global", "--add", "user.email", TestEmailAddress) if err != nil { return DoltUser{}, err } @@ -286,12 +292,12 @@ func (s *SqlServer) DB() (*sql.DB, error) { if err != nil { return nil, err } - for i := 0; i < 50; i++ { + for i := 0; i < ConnectAttempts; i++ { err = db.Ping() if err == nil { return db, nil } - time.Sleep(10 * time.Millisecond) + time.Sleep(RetrySleepDuration) } if err != nil { return nil, err diff --git a/integration-tests/go-sql-server-driver/testdef.go b/integration-tests/go-sql-server-driver/testdef.go index d37a5002c5..27226a1ec6 100644 --- a/integration-tests/go-sql-server-driver/testdef.go +++ b/integration-tests/go-sql-server-driver/testdef.go @@ -337,7 +337,7 @@ func RetryTestRun(t *testing.T, attempts int, test func(require.TestingT)) { var rtt *retryTestingT for i := 0; i < attempts; i++ { if i != 0 { - time.Sleep(50 * time.Millisecond) + time.Sleep(RetrySleepDuration) } rtt = new(retryTestingT) rtt.T = t