Flaky test fix TestCanGetKeyspaces (#16214)

Signed-off-by: Manan Gupta <[email protected]>
vitessio · Jun 18, 2024 · 1ffabca · 1ffabca
1 parent 231ba6b
commit 1ffabca
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/go/cmd/vttestserver/cli/main_test.go b/go/cmd/vttestserver/cli/main_test.go
@@ -238,9 +238,6 @@ func TestCanGetKeyspaces(t *testing.T) {
 	conf := config
 	defer resetConfig(conf)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
 	clusterInstance, err := startCluster()
 	require.NoError(t, err)
 	defer clusterInstance.TearDown()
@@ -251,16 +248,15 @@ func TestCanGetKeyspaces(t *testing.T) {
 		}
 	}()
 
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
 	assertGetKeyspaces(ctx, t, clusterInstance)
 }
 
 func TestExternalTopoServerConsul(t *testing.T) {
 	conf := config
 	defer resetConfig(conf)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
 	// Start a single consul in the background.
 	cmd, serverAddr := startConsul(t)
 	defer func() {
@@ -279,6 +275,8 @@ func TestExternalTopoServerConsul(t *testing.T) {
 	require.NoError(t, err)
 	defer cluster.TearDown()
 
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
 	assertGetKeyspaces(ctx, t, cluster)
 }