Move test files to regular names again (#15037)

vitessio · Jan 25, 2024 · ab8ae21 · ab8ae21
1 parent 5611de3
commit ab8ae21
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 17 deletions.
diff --git a/go/mysql/auth_server_static_flaky_test.go → go/mysql/auth_server_static_test.go b/go/mysql/auth_server_static_flaky_test.go → go/mysql/auth_server_static_test.go
diff --git a/go/mysql/conn_flaky_test.go → go/mysql/conn_test.go b/go/mysql/conn_flaky_test.go → go/mysql/conn_test.go
diff --git a/go/mysql/server_flaky_test.go → go/mysql/server_test.go b/go/mysql/server_flaky_test.go → go/mysql/server_test.go
@@ -478,11 +478,6 @@ func TestClientFoundRows(t *testing.T) {
 func TestConnCounts(t *testing.T) {
 	th := &testHandler{}
 
-	initialNumUsers := len(connCountPerUser.Counts())
-
-	// FIXME: we should be able to ResetAll counters instead of computing a delta, but it doesn't work for some reason
-	// connCountPerUser.ResetAll()
-
 	user := "anotherNotYetConnectedUser1"
 	passwd := "password1"
 
@@ -510,29 +505,26 @@ func TestConnCounts(t *testing.T) {
 	c, err := Connect(context.Background(), params)
 	require.NoError(t, err, "Connect failed")
 
-	connCounts := connCountPerUser.Counts()
-	assert.Equal(t, 1, len(connCounts)-initialNumUsers)
 	checkCountsForUser(t, user, 1)
 
 	// Test with a second new connection.
 	c2, err := Connect(context.Background(), params)
 	require.NoError(t, err)
-	connCounts = connCountPerUser.Counts()
-	// There is still only one new user.
-	assert.Equal(t, 1, len(connCounts)-initialNumUsers)
 	checkCountsForUser(t, user, 2)
 
-	// Test after closing connections. time.Sleep lets it work, but seems flakey.
+	// Test after closing connections.
 	c.Close()
-	// time.Sleep(10 * time.Millisecond)
-	// checkCountsForUser(t, user, 1)
+	assert.EventuallyWithT(t, func(t *assert.CollectT) {
+		checkCountsForUser(t, user, 1)
+	}, 1*time.Second, 10*time.Millisecond)
 
 	c2.Close()
-	// time.Sleep(10 * time.Millisecond)
-	// checkCountsForUser(t, user, 0)
+	assert.EventuallyWithT(t, func(t *assert.CollectT) {
+		checkCountsForUser(t, user, 0)
+	}, 1*time.Second, 10*time.Millisecond)
 }
 
-func checkCountsForUser(t *testing.T, user string, expected int64) {
+func checkCountsForUser(t assert.TestingT, user string, expected int64) {
 	connCounts := connCountPerUser.Counts()
 
 	userCount, ok := connCounts[user]

diff --git a/go/streamlog/streamlog_flaky_test.go → go/streamlog/streamlog_test.go b/go/streamlog/streamlog_flaky_test.go → go/streamlog/streamlog_test.go
diff --git a/go/timer/randticker_flaky_test.go → go/timer/randticker_test.go b/go/timer/randticker_flaky_test.go → go/timer/randticker_test.go
diff --git a/go/timer/suspendable_ticker_test.go b/go/timer/suspendable_ticker_test.go
@@ -133,7 +133,7 @@ func TestSuspendableTickerTick(t *testing.T) {
 	})
 	t.Run("tick after", func(t *testing.T) {
 		before := ticks.Load()
-		ticker.TickAfter(1 * time.Second)
+		ticker.TickAfter(2 * time.Second)
 		time.Sleep(time.Second)
 		after := ticks.Load()
 		assert.Zero(t, after-before)

diff --git a/go/timer/timer_flaky_test.go → go/timer/timer_test.go b/go/timer/timer_flaky_test.go → go/timer/timer_test.go
diff --git a/go/vt/grpcclient/client_flaky_test.go → go/vt/grpcclient/client_test.go b/go/vt/grpcclient/client_flaky_test.go → go/vt/grpcclient/client_test.go
diff --git a/go/vt/logutil/logutil_flaky_test.go → go/vt/logutil/logutil_test.go b/go/vt/logutil/logutil_flaky_test.go → go/vt/logutil/logutil_test.go