VReplication: Restore previous minimal e2e test behavior (#17016)

Signed-off-by: Matt Lord <[email protected]>
vitessio · Oct 21, 2024 · c5f0c03 · c5f0c03
1 parent 6c6499c
commit c5f0c03
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/go/test/endtoend/vreplication/movetables_mirrortraffic_test.go b/go/test/endtoend/vreplication/movetables_mirrortraffic_test.go
@@ -25,6 +25,14 @@ import (
 
 func testMoveTablesMirrorTraffic(t *testing.T, flavor workflowFlavor) {
 	setSidecarDBName("_vt")
+	ogReplicas := defaultReplicas
+	ogRdOnly := defaultRdonly
+	defer func() {
+		defaultReplicas = ogReplicas
+		defaultRdonly = ogRdOnly
+	}()
+	defaultRdonly = 0
+	defaultReplicas = 0
 	vc = setupMinimalCluster(t)
 	defer vc.TearDown()
 

diff --git a/go/test/endtoend/vreplication/partial_movetables_test.go b/go/test/endtoend/vreplication/partial_movetables_test.go
@@ -83,10 +83,13 @@ func testCancel(t *testing.T) {
 
 func testPartialMoveTablesBasic(t *testing.T, flavor workflowFlavor) {
 	setSidecarDBName("_vt")
+	origDefaultReplicas := defaultReplicas
 	origDefaultRdonly := defaultRdonly
 	defer func() {
+		defaultReplicas = origDefaultReplicas
 		defaultRdonly = origDefaultRdonly
 	}()
+	defaultReplicas = 0
 	defaultRdonly = 0
 	origExtraVTGateArgs := extraVTGateArgs
 	// We need to enable shard routing for partial movetables routing.

diff --git a/go/test/endtoend/vreplication/vdiff_online_ddl_test.go b/go/test/endtoend/vreplication/vdiff_online_ddl_test.go
@@ -23,13 +23,12 @@ func TestOnlineDDLVDiff(t *testing.T) {
 	setSidecarDBName("_vt")
 	originalRdonly := defaultRdonly
 	originalReplicas := defaultReplicas
-	defaultRdonly = 0
-	defaultReplicas = 0
 	defer func() {
 		defaultRdonly = originalRdonly
 		defaultReplicas = originalReplicas
 	}()
-
+	defaultRdonly = 0
+	defaultReplicas = 0
 	vc = setupMinimalCluster(t)
 	defer vc.TearDown()
 	keyspace := "product"

diff --git a/go/test/endtoend/vreplication/vreplication_vtctldclient_cli_test.go b/go/test/endtoend/vreplication/vreplication_vtctldclient_cli_test.go
@@ -46,10 +46,13 @@ import (
 func TestVtctldclientCLI(t *testing.T) {
 	setSidecarDBName("_vt")
 	var err error
+	origDefaultReplicas := defaultReplicas
 	origDefaultRdonly := defaultRdonly
 	defer func() {
+		defaultReplicas = origDefaultReplicas
 		defaultRdonly = origDefaultRdonly
 	}()
+	defaultReplicas = 1
 	defaultRdonly = 0
 	vc = setupMinimalCluster(t)
 	vttablet.InitVReplicationConfigDefaults()