X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/3a51bff0358c38162bc925ab25661e6090cf1161..bfc197c3b604baf0dba739ea174d5054284133f0:/tests/integration/redis-cli.tcl?ds=sidebyside diff --git a/tests/integration/redis-cli.tcl b/tests/integration/redis-cli.tcl index c4954304..40e4222e 100644 --- a/tests/integration/redis-cli.tcl +++ b/tests/integration/redis-cli.tcl @@ -28,6 +28,7 @@ start_server {tags {"cli"}} { flush $fd } + # Helpers to run tests in interactive mode proc run_command {fd cmd} { write_cli $fd $cmd set lines [split [read_cli $fd] "\n"] @@ -36,13 +37,34 @@ start_server {tags {"cli"}} { } proc test_interactive_cli {name code} { + set ::env(FAKETTY) 1 set fd [open_cli] test "Interactive CLI: $name" $code close_cli $fd + unset ::env(FAKETTY) } - proc run_nontty_cli {args} { - set fd [open [format "|src/redis-cli -p %d -n 9 $args" [srv port]] "r"] + # Helpers to run tests where stdout is not a tty + proc write_tmpfile {contents} { + set tmp [tmpfile "cli"] + set tmpfd [open $tmp "w"] + puts -nonewline $tmpfd $contents + close $tmpfd + set _ $tmp + } + + proc _run_cli {opts args} { + set cmd [format "src/redis-cli -p %d -n 9 $args" [srv port]] + foreach {key value} $opts { + if {$key eq "pipe"} { + set cmd "sh -c \"$value | $cmd\"" + } + if {$key eq "path"} { + set cmd "$cmd < $value" + } + } + + set fd [open "|$cmd" "r"] fconfigure $fd -buffering none fconfigure $fd -translation binary set resp [read $fd 1048576] @@ -50,19 +72,27 @@ start_server {tags {"cli"}} { set _ $resp } - proc test_nontty_cli {name code} { - test "Non-interactive non-TTY CLI: $name" $code + proc run_cli {args} { + _run_cli {} {*}$args } - proc run_tty_cli {args} { - set ::env(FAKETTY) 1 - set resp [run_nontty_cli {*}$args] - unset ::env(FAKETTY) - set _ $resp + proc run_cli_with_input_pipe {cmd args} { + _run_cli [list pipe $cmd] {*}$args + } + + proc run_cli_with_input_file {path args} { + _run_cli [list path $path] {*}$args } + proc test_nontty_cli {name code} { + test "Non-interactive non-TTY CLI: $name" $code + } + + # Helpers to run tests where stdout is a tty (fake it) proc test_tty_cli {name code} { + set ::env(FAKETTY) 1 test "Non-interactive TTY CLI: $name" $code + unset ::env(FAKETTY) } test_interactive_cli "INFO response should be printed raw" { @@ -111,46 +141,68 @@ start_server {tags {"cli"}} { } test_tty_cli "Status reply" { - assert_equal "OK\n" [run_tty_cli set key bar] + assert_equal "OK\n" [run_cli set key bar] assert_equal "bar" [r get key] } test_tty_cli "Integer reply" { r del counter - assert_equal "(integer) 1\n" [run_tty_cli incr counter] + assert_equal "(integer) 1\n" [run_cli incr counter] } test_tty_cli "Bulk reply" { r set key "tab\tnewline\n" - assert_equal "\"tab\\tnewline\\n\"\n" [run_tty_cli get key] + assert_equal "\"tab\\tnewline\\n\"\n" [run_cli get key] } test_tty_cli "Multi-bulk reply" { r del list r rpush list foo r rpush list bar - assert_equal "1. \"foo\"\n2. \"bar\"\n" [run_tty_cli lrange list 0 -1] + assert_equal "1. \"foo\"\n2. \"bar\"\n" [run_cli lrange list 0 -1] + } + + test_tty_cli "Read last argument from pipe" { + assert_equal "OK\n" [run_cli_with_input_pipe "echo foo" set key] + assert_equal "foo\n" [r get key] + } + + test_tty_cli "Read last argument from file" { + set tmpfile [write_tmpfile "from file"] + assert_equal "OK\n" [run_cli_with_input_file $tmpfile set key] + assert_equal "from file" [r get key] } test_nontty_cli "Status reply" { - assert_equal "OK" [run_nontty_cli set key bar] + assert_equal "OK" [run_cli set key bar] assert_equal "bar" [r get key] } test_nontty_cli "Integer reply" { r del counter - assert_equal "1" [run_nontty_cli incr counter] + assert_equal "1" [run_cli incr counter] } test_nontty_cli "Bulk reply" { r set key "tab\tnewline\n" - assert_equal "tab\tnewline\n" [run_nontty_cli get key] + assert_equal "tab\tnewline\n" [run_cli get key] } test_nontty_cli "Multi-bulk reply" { r del list r rpush list foo r rpush list bar - assert_equal "foo\nbar" [run_nontty_cli lrange list 0 -1] + assert_equal "foo\nbar" [run_cli lrange list 0 -1] + } + + test_nontty_cli "Read last argument from pipe" { + assert_equal "OK" [run_cli_with_input_pipe "echo foo" set key] + assert_equal "foo\n" [r get key] + } + + test_nontty_cli "Read last argument from file" { + set tmpfile [write_tmpfile "from file"] + assert_equal "OK" [run_cli_with_input_file $tmpfile set key] + assert_equal "from file" [r get key] } }