logictest: fix user cmd to respect nodeidx for cockroach-go testserver

This patch fixes the client creation for logic tests that use the cockroach-go testserver to use the specified nodeidx when connecting. Release note: None
cockroachdb · Jan 31, 2023 · a0240e8 · a0240e8
1 parent f0b3c65
commit a0240e8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/pkg/sql/logictest/logic.go b/pkg/sql/logictest/logic.go
@@ -1160,8 +1160,9 @@ func (t *logicTest) setUser(user string, nodeIdx int) func() {
 	var cleanupFunc func()
 	pgUser = strings.TrimPrefix(user, "host-cluster-")
 	if t.cfg.UseCockroachGoTestserver {
-		pgURL = *t.testserverCluster.PGURL()
+		pgURL = *t.testserverCluster.PGURLForNode(nodeIdx)
 		pgURL.User = url.User(pgUser)
+		pgURL.Path = "test"
 		cleanupFunc = func() {}
 	} else {
 		addr = t.cluster.Server(nodeIdx).ServingSQLAddr()

diff --git a/pkg/sql/logictest/testdata/logic_test/testserver_upgrade_node b/pkg/sql/logictest/testdata/logic_test/testserver_upgrade_node
@@ -24,6 +24,25 @@ SELECT crdb_internal.node_executable_version()
 ----
 22.2
 
+user root nodeidx=2
+
+query T
+SELECT crdb_internal.node_executable_version()
+----
+22.2
+
+query B
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+----
+false
+
+user root nodeidx=0
+
+query B
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+----
+true
+
 upgrade 2
 
 query B