From 87371afa9030f808bceea19a003e39890f9f31f5 Mon Sep 17 00:00:00 2001
From: Rafi Shamim <rafi@cockroachlabs.com>
Date: Fri, 7 Jul 2023 19:49:07 -0400
Subject: [PATCH] interactive_tests: preserve demo logs in tests

Now we pass in the --log-dir option so that logs are saved when the test
fails. Otherwise, the demo command does not log.

This also unskips two tests that should be working now.

Release note: None
---
 pkg/acceptance/generated_cli_test.go          | 14 ++++++++++
 .../{test_demo.tcl.disabled => test_demo.tcl} | 28 +++++++++----------
 .../test_demo_changefeeds.tcl                 |  4 +--
 .../test_demo_cli_integration.tcl             |  6 ++--
 .../interactive_tests/test_demo_global.tcl    |  2 +-
 .../test_demo_global_insecure.tcl             |  2 +-
 .../test_demo_locality_error.tcl              |  4 +--
 .../test_demo_memory_warning.tcl              |  2 +-
 .../test_demo_multitenant.tcl.disabled        |  2 +-
 ....tcl.disabled => test_demo_networking.tcl} | 16 +++++------
 .../interactive_tests/test_demo_node_cmds.tcl |  2 +-
 .../test_demo_partitioning.tcl.disabled       | 10 +++----
 .../interactive_tests/test_demo_telemetry.tcl |  2 +-
 .../interactive_tests/test_demo_workload.tcl  |  4 +--
 pkg/cli/interactive_tests/test_dump_sig.tcl   |  2 +-
 pkg/cli/interactive_tests/test_interrupt.tcl  |  2 +-
 pkg/cli/interactive_tests/test_local_cmds.tcl |  4 +--
 pkg/cli/interactive_tests/test_log_flags.tcl  |  2 +-
 pkg/cli/interactive_tests/test_notice.tcl     |  2 +-
 pkg/cli/interactive_tests/test_timing.tcl     |  2 +-
 20 files changed, 63 insertions(+), 49 deletions(-)
 rename pkg/cli/interactive_tests/{test_demo.tcl.disabled => test_demo.tcl} (93%)
 rename pkg/cli/interactive_tests/{test_demo_networking.tcl.disabled => test_demo_networking.tcl} (93%)

diff --git a/pkg/acceptance/generated_cli_test.go b/pkg/acceptance/generated_cli_test.go
index 0725b3a01224..83cbcec1bf23 100644
--- a/pkg/acceptance/generated_cli_test.go
+++ b/pkg/acceptance/generated_cli_test.go
@@ -88,6 +88,13 @@ func TestDockerCLI_test_copy(t *testing.T) {
 	runTestDockerCLI(t, "test_copy", "../cli/interactive_tests/test_copy.tcl")
 }
 
+func TestDockerCLI_test_demo(t *testing.T) {
+	s := log.Scope(t)
+	defer s.Close(t)
+
+	runTestDockerCLI(t, "test_demo", "../cli/interactive_tests/test_demo.tcl")
+}
+
 func TestDockerCLI_test_demo_changefeeds(t *testing.T) {
 	s := log.Scope(t)
 	defer s.Close(t)
@@ -130,6 +137,13 @@ func TestDockerCLI_test_demo_memory_warning(t *testing.T) {
 	runTestDockerCLI(t, "test_demo_memory_warning", "../cli/interactive_tests/test_demo_memory_warning.tcl")
 }
 
+func TestDockerCLI_test_demo_networking(t *testing.T) {
+	s := log.Scope(t)
+	defer s.Close(t)
+
+	runTestDockerCLI(t, "test_demo_networking", "../cli/interactive_tests/test_demo_networking.tcl")
+}
+
 func TestDockerCLI_test_demo_node_cmds(t *testing.T) {
 	s := log.Scope(t)
 	defer s.Close(t)
diff --git a/pkg/cli/interactive_tests/test_demo.tcl.disabled b/pkg/cli/interactive_tests/test_demo.tcl
similarity index 93%
rename from pkg/cli/interactive_tests/test_demo.tcl.disabled
rename to pkg/cli/interactive_tests/test_demo.tcl
index 5cbf3ae25a8f..d0d80d8d3b8a 100644
--- a/pkg/cli/interactive_tests/test_demo.tcl.disabled
+++ b/pkg/cli/interactive_tests/test_demo.tcl
@@ -3,7 +3,7 @@
 source [file join [file dirname $argv0] common.tcl]
 
 start_test "Check that demo insecure says hello properly, multitenant"
-spawn $argv demo --no-line-editor --insecure=true --multitenant=true
+spawn $argv demo --no-line-editor --insecure=true --multitenant=true --log-dir=logs
 # Be polite.
 eexpect "Welcome"
 # Warn the user that they won't get persistence.
@@ -28,7 +28,7 @@ eexpect eof
 end_test
 
 start_test "Check that demo insecure says hello properly, singletenant"
-spawn $argv demo --no-line-editor --insecure=true --multitenant=false
+spawn $argv demo --no-line-editor --insecure=true --multitenant=false --log-dir=logs
 # Check that the connection URL is printed; and that we're still
 # using default ports.
 eexpect "(webui)"
@@ -44,7 +44,7 @@ end_test
 start_test "Check that demo insecure, env var, says hello properly"
 # With env var.
 set ::env(COCKROACH_INSECURE) "true"
-spawn $argv demo --no-line-editor --no-example-database
+spawn $argv demo --no-line-editor --no-example-database --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 end_test
@@ -79,7 +79,7 @@ eexpect eof
 
 # With command-line override.
 set ::env(COCKROACH_INSECURE) "false"
-spawn $argv demo --no-line-editor --insecure=true --no-example-database
+spawn $argv demo --no-line-editor --insecure=true --no-example-database --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 
@@ -103,7 +103,7 @@ start_test "Check that demo secure says hello properly"
 
 # With env var.
 set ::env(COCKROACH_INSECURE) "false"
-spawn $argv demo --no-line-editor --no-example-database
+spawn $argv demo --no-line-editor --no-example-database --log-dir=logs
 eexpect "Welcome"
 
 eexpect "(webui)"
@@ -144,7 +144,7 @@ eexpect eof
 
 # With command-line override.
 set ::env(COCKROACH_INSECURE) "true"
-spawn $argv demo --no-line-editor --insecure=false --no-example-database
+spawn $argv demo --no-line-editor --insecure=false --no-example-database --log-dir=logs
 eexpect "Welcome"
 eexpect "Username: \"demo\", password"
 eexpect "defaultdb>"
@@ -168,7 +168,7 @@ end_test
 
 start_test "Check that the user can override the password."
 set ::env(COCKROACH_DEMO_PASSWORD) "hunter2"
-spawn $argv demo --no-line-editor --insecure=false --no-example-database
+spawn $argv demo --no-line-editor --insecure=false --no-example-database --log-dir=logs
 eexpect "Connection parameters"
 eexpect "(sql)"
 eexpect "postgresql://demo:hunter2@"
@@ -179,7 +179,7 @@ end_test
 
 # Test that demo displays connection URLs for nodes in the cluster.
 start_test "Check that node URLs are displayed"
-spawn $argv demo --no-line-editor --insecure --no-example-database
+spawn $argv demo --no-line-editor --insecure --no-example-database --log-dir=logs
 # Check that we see our message.
 eexpect "Connection parameters"
 eexpect "(webui)"
@@ -189,7 +189,7 @@ send_eof
 eexpect eof
 
 # Start the test again with a multi node cluster.
-spawn $argv demo --no-line-editor --insecure --nodes 3 --no-example-database
+spawn $argv demo --no-line-editor --insecure --nodes 3 --no-example-database --log-dir=logs
 
 # Check that we get a message for each node.
 eexpect "Connection parameters"
@@ -215,7 +215,7 @@ eexpect "defaultdb>"
 send_eof
 eexpect eof
 
-spawn $argv demo --no-line-editor --insecure=false --no-example-database
+spawn $argv demo --no-line-editor --insecure=false --no-example-database --log-dir=logs
 # Expect that security related tags are part of the connection URL.
 eexpect "(sql)"
 eexpect "sslmode=require"
@@ -249,7 +249,7 @@ end_test
 
 start_test "Check that the port numbers can be overridden from the command line."
 
-spawn $argv demo --no-line-editor --no-example-database --nodes 3 --http-port 8000
+spawn $argv demo --no-line-editor --no-example-database --nodes 3 --http-port 8000 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 
@@ -266,7 +266,7 @@ eexpect "defaultdb>"
 send_eof
 eexpect eof
 
-spawn $argv demo --no-line-editor --no-example-database --nodes 3 --sql-port 23000
+spawn $argv demo --no-line-editor --no-example-database --nodes 3 --sql-port 23000 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 
@@ -314,7 +314,7 @@ end_test
 
 start_test "Check that demo populates the connection URL in a configured file"
 
-spawn $argv demo --no-line-editor --no-example-database --listening-url-file=test.url
+spawn $argv demo --no-line-editor --no-example-database --listening-url-file=test.url --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 
@@ -325,7 +325,7 @@ send_eof
 eexpect eof
 
 # Ditto, insecure
-spawn $argv demo --no-line-editor --no-example-database --listening-url-file=test.url --insecure
+spawn $argv demo --no-line-editor --no-example-database --listening-url-file=test.url --insecure --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 
diff --git a/pkg/cli/interactive_tests/test_demo_changefeeds.tcl b/pkg/cli/interactive_tests/test_demo_changefeeds.tcl
index d6e845164f87..798267ec15b0 100644
--- a/pkg/cli/interactive_tests/test_demo_changefeeds.tcl
+++ b/pkg/cli/interactive_tests/test_demo_changefeeds.tcl
@@ -3,7 +3,7 @@
 source [file join [file dirname $argv0] common.tcl]
 
 start_test "Demo core changefeed using format=csv"
-spawn $argv demo --no-line-editor --format=csv
+spawn $argv demo --no-line-editor --format=csv --log-dir=logs
 
 # We should start in a populated database.
 eexpect "movr>"
@@ -24,7 +24,7 @@ eexpect eof
 end_test
 
 start_test "Demo with rangefeeds disabled as they are in real life"
-spawn $argv demo --no-line-editor --format=csv --auto-enable-rangefeeds=false
+spawn $argv demo --no-line-editor --format=csv --auto-enable-rangefeeds=false --log-dir=logs
 
 # We should start in a populated database.
 eexpect "movr>"
diff --git a/pkg/cli/interactive_tests/test_demo_cli_integration.tcl b/pkg/cli/interactive_tests/test_demo_cli_integration.tcl
index b28d7adebe22..27c8b1091366 100644
--- a/pkg/cli/interactive_tests/test_demo_cli_integration.tcl
+++ b/pkg/cli/interactive_tests/test_demo_cli_integration.tcl
@@ -5,7 +5,7 @@ source [file join [file dirname $argv0] common.tcl]
 set ::env(COCKROACH_INSECURE) "false"
 set python "python2.7"
 
-spawn $argv demo --empty --no-line-editor --multitenant=true
+spawn $argv demo --empty --no-line-editor --multitenant=true --log-dir=logs
 eexpect "Welcome"
 
 start_test "Check that the cli connect instructions get printed out."
@@ -183,7 +183,7 @@ set spawn_id $demo_spawn_id
 send "\\q\r"
 eexpect eof
 
-spawn $argv demo --empty --no-line-editor --multitenant=true
+spawn $argv demo --empty --no-line-editor --multitenant=true --log-dir=logs
 set demo_spawn_id $spawn_id
 eexpect "Welcome"
 eexpect "defaultdb>"
@@ -208,7 +208,7 @@ eexpect eof
 
 
 start_test "Check that the warning for the system tenant is not printed when there are no secondary tenants"
-spawn $argv demo --empty --no-line-editor --multitenant=false
+spawn $argv demo --empty --no-line-editor --multitenant=false --log-dir=logs
 eexpect "Welcome"
 expect {
     "ATTENTION: YOU ARE CONNECTED TO THE SYSTEM TENANT" { exit 1 }
diff --git a/pkg/cli/interactive_tests/test_demo_global.tcl b/pkg/cli/interactive_tests/test_demo_global.tcl
index 1df2ddfdde78..58b7362893e3 100644
--- a/pkg/cli/interactive_tests/test_demo_global.tcl
+++ b/pkg/cli/interactive_tests/test_demo_global.tcl
@@ -9,7 +9,7 @@ start_test "Check --global flag runs as expected"
 
 # Start a demo with --global set
 # TODO(ajstorm): Disable multitenancy until #76305 is resolved.
-spawn $argv demo --no-line-editor --no-example-database --nodes 9 --global --multitenant=false
+spawn $argv demo --no-line-editor --no-example-database --nodes 9 --global --multitenant=false --log-dir=logs
 
 # Ensure db is defaultdb.
 eexpect "defaultdb>"
diff --git a/pkg/cli/interactive_tests/test_demo_global_insecure.tcl b/pkg/cli/interactive_tests/test_demo_global_insecure.tcl
index 805177abbe64..e63e723e431c 100644
--- a/pkg/cli/interactive_tests/test_demo_global_insecure.tcl
+++ b/pkg/cli/interactive_tests/test_demo_global_insecure.tcl
@@ -9,7 +9,7 @@ start_test "Check --global flag runs as expected"
 
 # Start a demo with --global set
 # TODO(ajstorm): Disable multitenancy until #76305 is resolved.
-spawn $argv demo --no-line-editor --no-example-database --nodes 9 --global --multitenant=false --insecure
+spawn $argv demo --no-line-editor --no-example-database --nodes 9 --global --multitenant=false --insecure --log-dir=logs
 
 # Ensure db is defaultdb.
 eexpect "defaultdb>"
diff --git a/pkg/cli/interactive_tests/test_demo_locality_error.tcl b/pkg/cli/interactive_tests/test_demo_locality_error.tcl
index 21d6d7f1eadf..677bf299ccb4 100644
--- a/pkg/cli/interactive_tests/test_demo_locality_error.tcl
+++ b/pkg/cli/interactive_tests/test_demo_locality_error.tcl
@@ -5,13 +5,13 @@ source [file join [file dirname $argv0] common.tcl]
 start_test "Expect error with incorrect demo locality settings"
 
 # Test failure with less localities than expected.
-spawn $argv demo --nodes 3 --demo-locality=region=us-east1:region=us-east2
+spawn $argv demo --nodes 3 --demo-locality=region=us-east1:region=us-east2 --log-dir=logs
 # wait for the CLI to start up
 eexpect "ERROR: number of localities specified must equal number of nodes"
 eexpect eof
 
 # Test failure with more localities than expected.
-spawn $argv demo --nodes 3 --demo-locality=region=us-east1:region=us-east2:region=us-east3:region=us-east4
+spawn $argv demo --nodes 3 --demo-locality=region=us-east1:region=us-east2:region=us-east3:region=us-east4 --log-dir=logs
 # wait for the CLI to start up
 eexpect "ERROR: number of localities specified must equal number of nodes"
 eexpect eof
diff --git a/pkg/cli/interactive_tests/test_demo_memory_warning.tcl b/pkg/cli/interactive_tests/test_demo_memory_warning.tcl
index ba9b41cd8af7..018b542f1e7f 100644
--- a/pkg/cli/interactive_tests/test_demo_memory_warning.tcl
+++ b/pkg/cli/interactive_tests/test_demo_memory_warning.tcl
@@ -3,7 +3,7 @@
 source [file join [file dirname $argv0] common.tcl]
 
 start_test "Check demo alerts when there is a memory warning."
-spawn $argv demo --no-line-editor --no-example-database --max-sql-memory=10% --nodes=8
+spawn $argv demo --no-line-editor --no-example-database --max-sql-memory=10% --nodes=8 --log-dir=logs
 
 eexpect "WARNING: HIGH MEMORY USAGE"
 
diff --git a/pkg/cli/interactive_tests/test_demo_multitenant.tcl.disabled b/pkg/cli/interactive_tests/test_demo_multitenant.tcl.disabled
index 3541ebe4ec5b..ffff6c56f79e 100644
--- a/pkg/cli/interactive_tests/test_demo_multitenant.tcl.disabled
+++ b/pkg/cli/interactive_tests/test_demo_multitenant.tcl.disabled
@@ -8,7 +8,7 @@ source [file join [file dirname $argv0] common.tcl]
 start_test "Check --multitenant flag runs as expected"
 
 # Start a demo with --multitenant set
-spawn $argv demo --no-line-editor --empty --nodes 3 --multitenant
+spawn $argv demo --no-line-editor --empty --nodes 3 --multitenant --log-dir=logs
 
 eexpect "Welcome"
 eexpect "You are connected to tenant \"demoapp\""
diff --git a/pkg/cli/interactive_tests/test_demo_networking.tcl.disabled b/pkg/cli/interactive_tests/test_demo_networking.tcl
similarity index 93%
rename from pkg/cli/interactive_tests/test_demo_networking.tcl.disabled
rename to pkg/cli/interactive_tests/test_demo_networking.tcl
index 209edbff3e08..7bd82182268b 100644
--- a/pkg/cli/interactive_tests/test_demo_networking.tcl.disabled
+++ b/pkg/cli/interactive_tests/test_demo_networking.tcl
@@ -5,7 +5,7 @@ source [file join [file dirname $argv0] common.tcl]
 set ::env(COCKROACH_INSECURE) "false"
 
 start_test "Check that default demo has fixed ports, no multitenancy"
-spawn $argv demo --empty --no-line-editor --multitenant=false --nodes 2
+spawn $argv demo --empty --no-line-editor --multitenant=false --nodes 2 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 send "\\demo ls\r"
@@ -32,7 +32,7 @@ eexpect eof
 end_test
 
 start_test "Check that http port can be randomized, no multitenancy"
-spawn $argv demo --empty --no-line-editor --multitenant=false --nodes 2 --http-port 0
+spawn $argv demo --empty --no-line-editor --multitenant=false --nodes 2 --http-port 0 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 send "\\demo ls\r"
@@ -57,7 +57,7 @@ eexpect eof
 end_test
 
 start_test "Check that sql port can be randomized, no multitenancy"
-spawn $argv demo --empty --no-line-editor --multitenant=false --nodes 2 --sql-port 0
+spawn $argv demo --empty --no-line-editor --multitenant=false --nodes 2 --sql-port 0 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 send "\\demo ls\r"
@@ -80,7 +80,7 @@ eexpect eof
 end_test
 
 start_test "Check that sql and http port can be randomized, no multitenancy"
-spawn $argv demo --empty --no-line-editor --multitenant=false --nodes 2 --sql-port 0 --http-port 0
+spawn $argv demo --empty --no-line-editor --multitenant=false --nodes 2 --sql-port 0 --http-port 0 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 send "\\demo ls\r"
@@ -101,7 +101,7 @@ eexpect eof
 end_test
 
 start_test "Check that default demo has fixed ports, w/ multitenancy"
-spawn $argv demo --empty --no-line-editor --multitenant=true --nodes 2
+spawn $argv demo --empty --no-line-editor --multitenant=true --nodes 2 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 send "\\demo ls\r"
@@ -140,7 +140,7 @@ eexpect eof
 end_test
 
 start_test "Check that http port can be randomized, w/ multitenancy"
-spawn $argv demo --empty --no-line-editor --multitenant=true --nodes 2 --http-port 0
+spawn $argv demo --empty --no-line-editor --multitenant=true --nodes 2 --http-port 0 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 send "\\demo ls\r"
@@ -177,7 +177,7 @@ eexpect eof
 end_test
 
 start_test "Check that sql port can be randomized, w/ multitenancy"
-spawn $argv demo --empty --no-line-editor --multitenant=true --nodes 2 --sql-port 0
+spawn $argv demo --empty --no-line-editor --multitenant=true --nodes 2 --sql-port 0 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 send "\\demo ls\r"
@@ -208,7 +208,7 @@ eexpect eof
 end_test
 
 start_test "Check that sql and http port can be randomized, w/ multitenancy"
-spawn $argv demo --empty --no-line-editor --multitenant=true --nodes 2 --sql-port 0 --http-port 0
+spawn $argv demo --empty --no-line-editor --multitenant=true --nodes 2 --sql-port 0 --http-port 0 --log-dir=logs
 eexpect "Welcome"
 eexpect "defaultdb>"
 send "\\demo ls\r"
diff --git a/pkg/cli/interactive_tests/test_demo_node_cmds.tcl b/pkg/cli/interactive_tests/test_demo_node_cmds.tcl
index 6da92cae1a3b..b1b167ee74f6 100644
--- a/pkg/cli/interactive_tests/test_demo_node_cmds.tcl
+++ b/pkg/cli/interactive_tests/test_demo_node_cmds.tcl
@@ -5,7 +5,7 @@ source [file join [file dirname $argv0] common.tcl]
 start_test "Check \\demo commands work as expected"
 # Start a demo with 5 nodes. Set multitenant=false due to unsupported
 # gossip commands below.
-spawn $argv demo --empty --no-line-editor --nodes=5 --multitenant=false
+spawn $argv demo --empty --no-line-editor --nodes=5 --multitenant=false --log-dir=logs --log-dir=logs
 
 eexpect "defaultdb>"
 
diff --git a/pkg/cli/interactive_tests/test_demo_partitioning.tcl.disabled b/pkg/cli/interactive_tests/test_demo_partitioning.tcl.disabled
index a772c007edac..83ecf219bc46 100644
--- a/pkg/cli/interactive_tests/test_demo_partitioning.tcl.disabled
+++ b/pkg/cli/interactive_tests/test_demo_partitioning.tcl.disabled
@@ -20,7 +20,7 @@ eexpect $prompt
 
 start_test "Expect partitioning succeeds"
 # test that partitioning works if a license could be acquired
-send "$argv demo --no-line-editor --multitenant=false --geo-partitioned-replicas\r"
+send "$argv demo --no-line-editor --multitenant=false --geo-partitioned-replicas --log-dir=logs \r"
 
 # wait for the shell to start up
 eexpect "Partitioning the demo database"
@@ -84,7 +84,7 @@ eexpect $prompt
 end_test
 
 start_test "test multi-region setup"
-send "$argv demo movr --no-line-editor --geo-partitioned-replicas --multi-region\r"
+send "$argv demo movr --no-line-editor --geo-partitioned-replicas --multi-region --log-dir=logs \r"
 eexpect "Partitioning the demo database"
 eexpect "movr>"
 
@@ -106,7 +106,7 @@ eexpect "movr>"
 send_eof
 eexpect $prompt
 
-send "$argv demo movr --no-line-editor --geo-partitioned-replicas --multi-region --survive=region\r"
+send "$argv demo movr --no-line-editor --geo-partitioned-replicas --multi-region --survive=region --log-dir=logs \r"
 eexpect "Partitioning the demo database"
 eexpect "movr>"
 
@@ -134,7 +134,7 @@ eexpect $prompt
 end_test
 
 start_test "Expect an error if geo-partitioning is requested with multitenant mode"
-send "$argv demo --no-line-editor --geo-partitioned-replicas\r"
+send "$argv demo --no-line-editor --geo-partitioned-replicas --log-dir=logs \r"
 # expect a failure
 eexpect "operation is unsupported in multi-tenancy mode"
 eexpect $prompt
@@ -142,7 +142,7 @@ end_test
 
 start_test "Expect an error if geo-partitioning is requested and license acquisition is disabled"
 # set the proper environment variable
-send "$argv demo --no-line-editor --geo-partitioned-replicas --disable-demo-license\r"
+send "$argv demo --no-line-editor --geo-partitioned-replicas --disable-demo-license --log-dir=logs \r"
 # expect a failure
 eexpect "enterprise features are needed for this demo"
 eexpect $prompt
diff --git a/pkg/cli/interactive_tests/test_demo_telemetry.tcl b/pkg/cli/interactive_tests/test_demo_telemetry.tcl
index 19caf58c6407..989e910e26b6 100644
--- a/pkg/cli/interactive_tests/test_demo_telemetry.tcl
+++ b/pkg/cli/interactive_tests/test_demo_telemetry.tcl
@@ -6,7 +6,7 @@ start_test "Check cockroach demo telemetry can be disabled"
 
 # set the proper environment variable
 set env(COCKROACH_SKIP_ENABLING_DIAGNOSTIC_REPORTING) "true"
-spawn $argv demo --no-line-editor
+spawn $argv demo --no-line-editor --log-dir=logs
 
 # Expect an informational message.
 eexpect "Telemetry disabled by configuration."
diff --git a/pkg/cli/interactive_tests/test_demo_workload.tcl b/pkg/cli/interactive_tests/test_demo_workload.tcl
index 4461c3d71f98..6fabf0805324 100644
--- a/pkg/cli/interactive_tests/test_demo_workload.tcl
+++ b/pkg/cli/interactive_tests/test_demo_workload.tcl
@@ -5,7 +5,7 @@ source [file join [file dirname $argv0] common.tcl]
 start_test "Check cockroach demo --with-load runs the movr workload"
 
 # Start demo with movr and the movr workload.
-spawn $argv demo movr --with-load  --no-line-editor
+spawn $argv demo movr --with-load  --no-line-editor --log-dir=logs
 
 eexpect "movr>"
 
@@ -42,7 +42,7 @@ start_test "Check that controlling ranges of the movr dataset works"
 set timeout 30
 # Need to disable multi-tenant mode here, as splitting is not supported.
 # See 54254 for more details.
-spawn $argv demo movr --num-ranges=6 --multitenant=false  --no-line-editor
+spawn $argv demo movr --num-ranges=6 --multitenant=false  --no-line-editor --log-dir=logs
 
 eexpect "movr>"
 
diff --git a/pkg/cli/interactive_tests/test_dump_sig.tcl b/pkg/cli/interactive_tests/test_dump_sig.tcl
index c3f8b4f1a039..6551a935ded1 100644
--- a/pkg/cli/interactive_tests/test_dump_sig.tcl
+++ b/pkg/cli/interactive_tests/test_dump_sig.tcl
@@ -25,7 +25,7 @@ eexpect ":/# "
 end_test
 
 start_test "Check that the client also can generate goroutine dumps."
-send "$argv demo --no-line-editor --no-example-database\r"
+send "$argv demo --no-line-editor --no-example-database --log-dir=logs \r"
 eexpect root@
 # Dump goroutines in server.
 system "killall -QUIT `basename \$(realpath $argv)`"
diff --git a/pkg/cli/interactive_tests/test_interrupt.tcl b/pkg/cli/interactive_tests/test_interrupt.tcl
index 2585ac00bb9b..9cca07638dd1 100644
--- a/pkg/cli/interactive_tests/test_interrupt.tcl
+++ b/pkg/cli/interactive_tests/test_interrupt.tcl
@@ -123,7 +123,7 @@ stop_server $argv
 # Regression test for #92943.
 start_test "Check that SIGTERM sent to an interactive shell terminates the shell."
 
-spawn $argv demo --empty --pid-file=demo_pid
+spawn $argv demo --empty --pid-file=demo_pid --log-dir=logs
 eexpect "Welcome"
 eexpect root@
 eexpect "defaultdb>"
diff --git a/pkg/cli/interactive_tests/test_local_cmds.tcl b/pkg/cli/interactive_tests/test_local_cmds.tcl
index af4e2d0bf1bc..33176fe4be0c 100755
--- a/pkg/cli/interactive_tests/test_local_cmds.tcl
+++ b/pkg/cli/interactive_tests/test_local_cmds.tcl
@@ -332,7 +332,7 @@ stop_server $argv
 start_test "Check that client-side options can be overridden with set"
 
 # First establish a baseline with all the defaults.
-send "$argv demo --no-line-editor --no-example-database\r"
+send "$argv demo --no-line-editor --no-example-database --log-dir=logs \r"
 eexpect root@
 send "\\set display_format csv\r"
 send "\\set\r"
@@ -347,7 +347,7 @@ send_eof
 eexpect ":/# "
 
 # Then verify that the defaults can be overridden.
-send "$argv demo --no-line-editor --no-example-database --set=auto_trace=on --set=check_syntax=false --set=echo=true --set=errexit=true --set=prompt1=%n@haa --set=show_times=false\r"
+send "$argv demo --no-line-editor --no-example-database --set=auto_trace=on --set=check_syntax=false --set=echo=true --set=errexit=true --set=prompt1=%n@haa --set=show_times=false --log-dir=logs \r"
 eexpect root@
 send "\\set display_format csv\r"
 send "\\set\r"
diff --git a/pkg/cli/interactive_tests/test_log_flags.tcl b/pkg/cli/interactive_tests/test_log_flags.tcl
index f3a8dac5c2ba..49fcac53342e 100644
--- a/pkg/cli/interactive_tests/test_log_flags.tcl
+++ b/pkg/cli/interactive_tests/test_log_flags.tcl
@@ -83,7 +83,7 @@ eexpect ":/# "
 end_test
 
 start_test "Check that by default, cockroach demo shows the fatal errors"
-send "$argv demo --no-line-editor --empty\r"
+send "$argv demo --no-line-editor --empty --log-dir=logs \r"
 eexpect "Welcome"
 eexpect "root@"
 eexpect "defaultdb>"
diff --git a/pkg/cli/interactive_tests/test_notice.tcl b/pkg/cli/interactive_tests/test_notice.tcl
index cc57a97bdd7c..4e079f6aa2fb 100644
--- a/pkg/cli/interactive_tests/test_notice.tcl
+++ b/pkg/cli/interactive_tests/test_notice.tcl
@@ -4,7 +4,7 @@ source [file join [file dirname $argv0] common.tcl]
 
 # This test ensures notices are being sent as expected.
 
-spawn $argv demo --no-line-editor --no-example-database
+spawn $argv demo --no-line-editor --no-example-database --log-dir=logs
 eexpect root@
 
 start_test "Test that notices always appear at the end after all results."
diff --git a/pkg/cli/interactive_tests/test_timing.tcl b/pkg/cli/interactive_tests/test_timing.tcl
index a8dae663d7d2..837573af64dd 100644
--- a/pkg/cli/interactive_tests/test_timing.tcl
+++ b/pkg/cli/interactive_tests/test_timing.tcl
@@ -4,7 +4,7 @@ source [file join [file dirname $argv0] common.tcl]
 
 # This test ensures timing displayed in the CLI works as expected.
 
-spawn $argv demo movr --no-line-editor
+spawn $argv demo movr --no-line-editor --log-dir=logs
 eexpect root@
 
 start_test "Test that server execution time and network latency are printed by default."