Fix breakage from concurrent merge

mattlord · mattlord · commit ef7fbd20d955 · 2023-12-27T14:57:58.000-05:00
We merged these two PRs concurrently and thus ended up with a breakage: - vitessio#14735 - vitessio#14786 This PR addresses that issue by using a locally scoped vtgate connection according to the newly established model. Signed-off-by: Matt Lord <mattalord@gmail.com>
diff --git a/go/test/endtoend/vreplication/vdiff2_test.go b/go/test/endtoend/vreplication/vdiff2_test.go
@@ -172,6 +172,8 @@ func TestVDiff2(t *testing.T) {
 }
 
 func testWorkflow(t *testing.T, vc *VitessCluster, tc *testCase, tks *Keyspace, cells []*Cell) {
+	vtgateConn := vc.GetVTGateConn(t)
+	defer vtgateConn.Close()
 	arrTargetShards := strings.Split(tc.targetShards, ",")
 	if tc.typ == "Reshard" {
 		require.NoError(t, vc.AddShards(t, cells, tks, tc.targetShards, 0, 0, tc.tabletBaseID, targetKsOpts))

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,8 @@ func TestVDiff2(t *testing.T) {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`func testWorkflow(t testing.T, vc VitessCluster, tc testCase, tks Keyspace, cells []*Cell) {`
	`175`	`+ vtgateConn := vc.GetVTGateConn(t)`
	`176`	`+ defer vtgateConn.Close()`
`175`	`177`	`arrTargetShards := strings.Split(tc.targetShards, ",")`
`176`	`178`	`if tc.typ == "Reshard" {`
`177`	`179`	`require.NoError(t, vc.AddShards(t, cells, tks, tc.targetShards, 0, 0, tc.tabletBaseID, targetKsOpts))`