Skip to content

Commit

Permalink
Merge #49937
Browse files Browse the repository at this point in the history
49937: cli/interactive_tests: misc improvements r=rohany a=knz

Found while working on #48051

Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
  • Loading branch information
craig[bot] and knz committed Jun 6, 2020
2 parents 57e37b4 + 5ce39f5 commit 3bf61fd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pkg/cli/interactive_tests/test_extern_dir.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
source [file join [file dirname $argv0] common.tcl]

set storedir "mystore"
set storedir "logs/mystore"
set externdir "/some/extern"

spawn /bin/bash
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/interactive_tests/test_flags.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ send "PS1=':''/# '\r"
eexpect ":/# "

start_test "Check that --max-disk-temp-storage works."
send "$argv start-single-node --insecure --store=path=mystore --max-disk-temp-storage=10GiB\r"
send "$argv start-single-node --insecure --store=path=logs/mystore --max-disk-temp-storage=10GiB\r"
eexpect "node starting"
interrupt
eexpect ":/# "
end_test

start_test "Check that --max-disk-temp-storage can be expressed as a percentage."
send "$argv start-single-node --insecure --store=path=mystore --max-disk-temp-storage=10%\r"
send "$argv start-single-node --insecure --store=path=logs/mystore --max-disk-temp-storage=10%\r"
eexpect "node starting"
interrupt
eexpect ":/# "
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/interactive_tests/test_sql_mem_monitor.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ start_server $argv
system "echo 'select * from system.information_schema.columns;' | $argv sql >/dev/null"

# What memory is currently consumed by the server?
set vmem [ exec ps --no-headers o vsz -p [ exec cat server_pid ] ]
set vmem [ exec ps -o vsz= -p [ exec cat server_pid ] ]

# Now play. First, shut down the running server.
stop_server $argv
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/interactive_tests/test_temp_dir.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ source [file join [file dirname $argv0] common.tcl]

set recordfile "temp-dirs-record.txt"
set tempprefix "cockroach-temp"
set storedir "mystore"
set tempdir "mystore/temp"
set storedir "logs/mystore"
set tempdir "logs/mystore/temp"
set cwd ""
# Ensure that pwd will only return absolute paths.
cd [file normalize [pwd]]
Expand Down

0 comments on commit 3bf61fd

Please sign in to comment.