From 1cedebb79921bc5fa5bb1e5cbaf30ba67511df8b Mon Sep 17 00:00:00 2001 From: Matt Stancliff Date: Thu, 31 Jul 2014 14:39:49 -0400 Subject: [PATCH] Remove trailing spaces from tests --- tests/cluster/tests/03-failover-loop.tcl | 2 +- tests/integration/replication.tcl | 10 +++++----- tests/support/redis.tcl | 2 +- tests/support/server.tcl | 10 +++++----- tests/unit/auth.tcl | 2 +- tests/unit/basic.tcl | 6 +++--- tests/unit/bitops.tcl | 2 +- tests/unit/introspection.tcl | 2 +- tests/unit/maxmemory.tcl | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/cluster/tests/03-failover-loop.tcl b/tests/cluster/tests/03-failover-loop.tcl index 3a966732a..8e1bcd6fe 100644 --- a/tests/cluster/tests/03-failover-loop.tcl +++ b/tests/cluster/tests/03-failover-loop.tcl @@ -89,7 +89,7 @@ while {[incr iterations -1]} { test "Restarting node #$tokill" { restart_instance redis $tokill } - + test "Instance #$tokill is now a slave" { wait_for_condition 1000 50 { [RI $tokill role] eq {slave} diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl index ae1977dc2..767349e56 100644 --- a/tests/integration/replication.tcl +++ b/tests/integration/replication.tcl @@ -35,17 +35,17 @@ start_server {tags {"repl"}} { start_server {tags {"repl"}} { r set mykey foo - + start_server {} { test {Second server should have role master at first} { s role } {master} - + test {SLAVEOF should start with link status "down"} { r slaveof [srv -1 host] [srv -1 port] s master_link_status } {down} - + test {The role should immediately be changed to "slave"} { s role } {slave} @@ -54,11 +54,11 @@ start_server {tags {"repl"}} { test {Sync should have transferred keys from master} { r get mykey } {foo} - + test {The link status should be up} { s master_link_status } {up} - + test {SET on the master should immediately propagate} { r -1 set mykey bar diff --git a/tests/support/redis.tcl b/tests/support/redis.tcl index ad9cbe8ab..cd8ae3a34 100644 --- a/tests/support/redis.tcl +++ b/tests/support/redis.tcl @@ -18,7 +18,7 @@ # $r ping [list handlePong] # } # } -# +# # set r [redis] # $r blocking 0 # $r get fo [list handlePong] diff --git a/tests/support/server.tcl b/tests/support/server.tcl index 9f92ce31e..0e2e2982a 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -178,10 +178,10 @@ proc start_server {options {code undefined}} { dict set config $directive $arguments } } - + # use a different directory every time a server is started dict set config dir [tmpdir server] - + # start every server on a different port set ::port [find_available_port [expr {$::port+1}]] dict set config port $::port @@ -190,7 +190,7 @@ proc start_server {options {code undefined}} { foreach {directive arguments} [concat $::global_overrides $overrides] { dict set config $directive $arguments } - + # write new configuration to temporary file set config_file [tmpfile redis.conf] set fp [open $config_file w+] @@ -208,7 +208,7 @@ proc start_server {options {code undefined}} { } else { exec src/redis-server $config_file > $stdout 2> $stderr & } - + # check that the server actually started # ugly but tries to be as fast as possible... if {$::valgrind} {set retrynum 1000} else {set retrynum 100} @@ -233,7 +233,7 @@ proc start_server {options {code undefined}} { start_server_error $config_file $err return } - + # find out the pid while {![info exists pid]} { regexp {PID:\s(\d+)} [exec cat $stdout] _ pid diff --git a/tests/unit/auth.tcl b/tests/unit/auth.tcl index 15753e9e7..633cda95c 100644 --- a/tests/unit/auth.tcl +++ b/tests/unit/auth.tcl @@ -10,7 +10,7 @@ start_server {tags {"auth"} overrides {requirepass foobar}} { catch {r auth wrong!} err set _ $err } {ERR*invalid password} - + test {Arbitrary command gives an error when AUTH is required} { catch {r set foo bar} err set _ $err diff --git a/tests/unit/basic.tcl b/tests/unit/basic.tcl index e3680a4fb..6f725d299 100644 --- a/tests/unit/basic.tcl +++ b/tests/unit/basic.tcl @@ -300,7 +300,7 @@ start_server {tags {"basic"}} { catch {r foobaredcommand} err string match ERR* $err } {1} - + test {RENAME basic usage} { r set mykey hello r rename mykey mykey1 @@ -426,7 +426,7 @@ start_server {tags {"basic"}} { r select 9 format $res } {hello world foo bared} - + test {MGET} { r flushdb r set foo BAR @@ -482,7 +482,7 @@ start_server {tags {"basic"}} { r set foo bar list [r getset foo xyz] [r get foo] } {bar xyz} - + test {MSET base case} { r mset x 10 y "foo bar" z "x x x x x x x\n\n\r\n" r mget x y z diff --git a/tests/unit/bitops.tcl b/tests/unit/bitops.tcl index 896310980..9751850ad 100644 --- a/tests/unit/bitops.tcl +++ b/tests/unit/bitops.tcl @@ -125,7 +125,7 @@ start_server {tags {"bitops"}} { test {BITOP where dest and target are the same key} { r set s "\xaa\x00\xff\x55" r bitop not s s - r get s + r get s } "\x55\xff\x00\xaa" test {BITOP AND|OR|XOR don't change the string with single input key} { diff --git a/tests/unit/introspection.tcl b/tests/unit/introspection.tcl index 54742bb02..342bb939a 100644 --- a/tests/unit/introspection.tcl +++ b/tests/unit/introspection.tcl @@ -27,7 +27,7 @@ start_server {tags {"introspection"}} { test {CLIENT LIST shows empty fields for unassigned names} { r client list } {*name= *} - + test {CLIENT SETNAME does not accept spaces} { catch {r client setname "foo bar"} e set e diff --git a/tests/unit/maxmemory.tcl b/tests/unit/maxmemory.tcl index 1431a2ac7..e6bf7860c 100644 --- a/tests/unit/maxmemory.tcl +++ b/tests/unit/maxmemory.tcl @@ -28,7 +28,7 @@ start_server {tags {"maxmemory"}} { } { test "maxmemory - is the memory limit honoured? (policy $policy)" { # make sure to start with a blank instance - r flushall + r flushall # Get the current memory limit and calculate a new limit. # We just add 100k to the current memory size so that it is # fast for us to reach that limit. @@ -60,7 +60,7 @@ start_server {tags {"maxmemory"}} { } { test "maxmemory - only allkeys-* should remove non-volatile keys ($policy)" { # make sure to start with a blank instance - r flushall + r flushall # Get the current memory limit and calculate a new limit. # We just add 100k to the current memory size so that it is # fast for us to reach that limit. @@ -102,7 +102,7 @@ start_server {tags {"maxmemory"}} { } { test "maxmemory - policy $policy should only remove volatile keys." { # make sure to start with a blank instance - r flushall + r flushall # Get the current memory limit and calculate a new limit. # We just add 100k to the current memory size so that it is # fast for us to reach that limit.