New commands: BITOP and BITCOUNT.

[redis.git] / tests / integration / redis-cli.tcl

diff --git a/tests/integration/redis-cli.tcl b/tests/integration/redis-cli.tcl
index 3413e8a2d0f294159fdf733be93384535d8f0da8..40e4222e3e3a20d85dd6f284b07c856177d357bc 100644 (file)
--- a/tests/integration/redis-cli.tcl
+++ b/tests/integration/redis-cli.tcl
@@ -45,8 +45,26 @@ start_server {tags {"cli"}} {
     }
 
     # Helpers to run tests where stdout is not a tty
     }
 
     # Helpers to run tests where stdout is not a tty

-    proc run_cli {args} {
-        set fd [open [format "|src/redis-cli -p %d -n 9 $args" [srv port]] "r"]
+    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]
         fconfigure $fd -buffering none
         fconfigure $fd -translation binary
         set resp [read $fd 1048576]


@@ -54,6 +72,18 @@ start_server {tags {"cli"}} {
         set _ $resp
     }
 
         set _ $resp
     }
 

+    proc run_cli {args} {
+        _run_cli {} {*}$args
+    }
+
+    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
     }
     proc test_nontty_cli {name code} {
         test "Non-interactive non-TTY CLI: $name" $code
     }


@@ -132,6 +162,17 @@ start_server {tags {"cli"}} {
         assert_equal "1. \"foo\"\n2. \"bar\"\n" [run_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_cli set key bar]
         assert_equal "bar" [r get key]
     test_nontty_cli "Status reply" {
         assert_equal "OK" [run_cli set key bar]
         assert_equal "bar" [r get key]


@@ -153,4 +194,15 @@ start_server {tags {"cli"}} {
         r rpush list bar
         assert_equal "foo\nbar" [run_cli lrange list 0 -1]
     }
         r rpush list bar
         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]
+    }

 }
 }