Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
c3375fbd
Commit
c3375fbd
authored
Jul 31, 2014
by
Matt Stancliff
Committed by
antirez
Oct 06, 2014
Browse files
Remove trailing spaces from tests
parent
c4d32c03
Changes
8
Hide whitespace changes
Inline
Side-by-side
tests/integration/replication.tcl
View file @
c3375fbd
...
@@ -35,17 +35,17 @@ start_server {tags {"repl"}} {
...
@@ -35,17 +35,17 @@ start_server {tags {"repl"}} {
start_server
{
tags
{
"repl"
}}
{
start_server
{
tags
{
"repl"
}}
{
r set mykey foo
r set mykey foo
start_server
{}
{
start_server
{}
{
test
{
Second server should have role master at first
}
{
test
{
Second server should have role master at first
}
{
s role
s role
}
{
master
}
}
{
master
}
test
{
SLAVEOF should start with link status
"down"
}
{
test
{
SLAVEOF should start with link status
"down"
}
{
r slaveof
[
srv -1 host
]
[
srv -1 port
]
r slaveof
[
srv -1 host
]
[
srv -1 port
]
s master_link_status
s master_link_status
}
{
down
}
}
{
down
}
test
{
The role should immediately be changed to
"slave"
}
{
test
{
The role should immediately be changed to
"slave"
}
{
s role
s role
}
{
slave
}
}
{
slave
}
...
@@ -54,11 +54,11 @@ start_server {tags {"repl"}} {
...
@@ -54,11 +54,11 @@ start_server {tags {"repl"}} {
test
{
Sync should have transferred keys from master
}
{
test
{
Sync should have transferred keys from master
}
{
r get mykey
r get mykey
}
{
foo
}
}
{
foo
}
test
{
The link status should be up
}
{
test
{
The link status should be up
}
{
s master_link_status
s master_link_status
}
{
up
}
}
{
up
}
test
{
SET on the master should immediately propagate
}
{
test
{
SET on the master should immediately propagate
}
{
r -1 set mykey bar
r -1 set mykey bar
...
...
tests/support/redis.tcl
View file @
c3375fbd
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
# $r ping
[
list handlePong
]
# $r ping
[
list handlePong
]
#
}
#
}
#
}
#
}
#
#
# set r
[
redis
]
# set r
[
redis
]
# $r blocking 0
# $r blocking 0
# $r get fo
[
list handlePong
]
# $r get fo
[
list handlePong
]
...
...
tests/support/server.tcl
View file @
c3375fbd
...
@@ -178,10 +178,10 @@ proc start_server {options {code undefined}} {
...
@@ -178,10 +178,10 @@ proc start_server {options {code undefined}} {
dict set config $directive $arguments
dict set config $directive $arguments
}
}
}
}
# use a different directory every time a server is started
# use a different directory every time a server is started
dict set config dir
[
tmpdir server
]
dict set config dir
[
tmpdir server
]
# start every server on a different port
# start every server on a different port
set ::port
[
find_available_port
[
expr
{
$::port
+1
}]]
set ::port
[
find_available_port
[
expr
{
$::port
+1
}]]
dict set config port $::port
dict set config port $::port
...
@@ -190,7 +190,7 @@ proc start_server {options {code undefined}} {
...
@@ -190,7 +190,7 @@ proc start_server {options {code undefined}} {
foreach
{
directive arguments
}
[
concat $::global_overrides $overrides
]
{
foreach
{
directive arguments
}
[
concat $::global_overrides $overrides
]
{
dict set config $directive $arguments
dict set config $directive $arguments
}
}
# write new configuration to temporary file
# write new configuration to temporary file
set config_file
[
tmpfile redis.conf
]
set config_file
[
tmpfile redis.conf
]
set fp
[
open $config_file w+
]
set fp
[
open $config_file w+
]
...
@@ -208,7 +208,7 @@ proc start_server {options {code undefined}} {
...
@@ -208,7 +208,7 @@ proc start_server {options {code undefined}} {
}
else
{
}
else
{
exec src/redis-server $config_file > $stdout 2> $stderr &
exec src/redis-server $config_file > $stdout 2> $stderr &
}
}
# check that the server actually started
# check that the server actually started
# ugly but tries to be as fast as possible...
# ugly but tries to be as fast as possible...
if
{
$::valgrind
}
{
set retrynum 1000
}
else
{
set retrynum 100
}
if
{
$::valgrind
}
{
set retrynum 1000
}
else
{
set retrynum 100
}
...
@@ -233,7 +233,7 @@ proc start_server {options {code undefined}} {
...
@@ -233,7 +233,7 @@ proc start_server {options {code undefined}} {
start_server_error $config_file $err
start_server_error $config_file $err
return
return
}
}
# find out the pid
# find out the pid
while
{
!
[
info exists pid
]}
{
while
{
!
[
info exists pid
]}
{
regexp
{
\[
(
\d
+
)
\]
}
[
exec cat $stdout
]
_ pid
regexp
{
\[
(
\d
+
)
\]
}
[
exec cat $stdout
]
_ pid
...
...
tests/unit/auth.tcl
View file @
c3375fbd
...
@@ -10,7 +10,7 @@ start_server {tags {"auth"} overrides {requirepass foobar}} {
...
@@ -10,7 +10,7 @@ start_server {tags {"auth"} overrides {requirepass foobar}} {
catch
{
r auth wrong!
}
err
catch
{
r auth wrong!
}
err
set _ $err
set _ $err
}
{
ERR*invalid password
}
}
{
ERR*invalid password
}
test
{
Arbitrary command gives an error when AUTH is required
}
{
test
{
Arbitrary command gives an error when AUTH is required
}
{
catch
{
r set foo bar
}
err
catch
{
r set foo bar
}
err
set _ $err
set _ $err
...
...
tests/unit/basic.tcl
View file @
c3375fbd
...
@@ -300,7 +300,7 @@ start_server {tags {"basic"}} {
...
@@ -300,7 +300,7 @@ start_server {tags {"basic"}} {
catch
{
r foobaredcommand
}
err
catch
{
r foobaredcommand
}
err
string match ERR* $err
string match ERR* $err
}
{
1
}
}
{
1
}
test
{
RENAME basic usage
}
{
test
{
RENAME basic usage
}
{
r set mykey hello
r set mykey hello
r rename mykey mykey1
r rename mykey mykey1
...
@@ -426,7 +426,7 @@ start_server {tags {"basic"}} {
...
@@ -426,7 +426,7 @@ start_server {tags {"basic"}} {
r select 9
r select 9
format $res
format $res
}
{
hello world foo bared
}
}
{
hello world foo bared
}
test
{
MGET
}
{
test
{
MGET
}
{
r flushdb
r flushdb
r set foo BAR
r set foo BAR
...
@@ -482,7 +482,7 @@ start_server {tags {"basic"}} {
...
@@ -482,7 +482,7 @@ start_server {tags {"basic"}} {
r set foo bar
r set foo bar
list
[
r getset foo xyz
]
[
r get foo
]
list
[
r getset foo xyz
]
[
r get foo
]
}
{
bar xyz
}
}
{
bar xyz
}
test
{
MSET base case
}
{
test
{
MSET base case
}
{
r mset x 10 y
"foo bar"
z
"x x x x x x x
\n\n\r\n
"
r mset x 10 y
"foo bar"
z
"x x x x x x x
\n\n\r\n
"
r mget x y z
r mget x y z
...
...
tests/unit/bitops.tcl
View file @
c3375fbd
...
@@ -125,7 +125,7 @@ start_server {tags {"bitops"}} {
...
@@ -125,7 +125,7 @@ start_server {tags {"bitops"}} {
test
{
BITOP where dest and target are the same key
}
{
test
{
BITOP where dest and target are the same key
}
{
r set s
"
\xaa\x00\xff\x55
"
r set s
"
\xaa\x00\xff\x55
"
r bitop not s s
r bitop not s s
r get s
r get s
}
"
\x55\xff\x00\xaa
"
}
"
\x55\xff\x00\xaa
"
test
{
BITOP AND|OR|XOR don't change the string with single input key
}
{
test
{
BITOP AND|OR|XOR don't change the string with single input key
}
{
...
...
tests/unit/introspection.tcl
View file @
c3375fbd
...
@@ -27,7 +27,7 @@ start_server {tags {"introspection"}} {
...
@@ -27,7 +27,7 @@ start_server {tags {"introspection"}} {
test
{
CLIENT LIST shows empty fields for unassigned names
}
{
test
{
CLIENT LIST shows empty fields for unassigned names
}
{
r client list
r client list
}
{
*name= *
}
}
{
*name= *
}
test
{
CLIENT SETNAME does not accept spaces
}
{
test
{
CLIENT SETNAME does not accept spaces
}
{
catch
{
r client setname
"foo bar"
}
e
catch
{
r client setname
"foo bar"
}
e
set e
set e
...
...
tests/unit/maxmemory.tcl
View file @
c3375fbd
...
@@ -28,7 +28,7 @@ start_server {tags {"maxmemory"}} {
...
@@ -28,7 +28,7 @@ start_server {tags {"maxmemory"}} {
}
{
}
{
test
"maxmemory - is the memory limit honoured? (policy
$policy
)"
{
test
"maxmemory - is the memory limit honoured? (policy
$policy
)"
{
# make sure to start with a blank instance
# make sure to start with a blank instance
r flushall
r flushall
# Get the current memory limit and calculate a new limit.
# Get the current memory limit and calculate a new limit.
# We just add 100k to the current memory size so that it is
# We just add 100k to the current memory size so that it is
# fast for us to reach that limit.
# fast for us to reach that limit.
...
@@ -60,7 +60,7 @@ start_server {tags {"maxmemory"}} {
...
@@ -60,7 +60,7 @@ start_server {tags {"maxmemory"}} {
}
{
}
{
test
"maxmemory - only allkeys-* should remove non-volatile keys (
$policy
)"
{
test
"maxmemory - only allkeys-* should remove non-volatile keys (
$policy
)"
{
# make sure to start with a blank instance
# make sure to start with a blank instance
r flushall
r flushall
# Get the current memory limit and calculate a new limit.
# Get the current memory limit and calculate a new limit.
# We just add 100k to the current memory size so that it is
# We just add 100k to the current memory size so that it is
# fast for us to reach that limit.
# fast for us to reach that limit.
...
@@ -102,7 +102,7 @@ start_server {tags {"maxmemory"}} {
...
@@ -102,7 +102,7 @@ start_server {tags {"maxmemory"}} {
}
{
}
{
test
"maxmemory - policy
$policy
should only remove volatile keys."
{
test
"maxmemory - policy
$policy
should only remove volatile keys."
{
# make sure to start with a blank instance
# make sure to start with a blank instance
r flushall
r flushall
# Get the current memory limit and calculate a new limit.
# Get the current memory limit and calculate a new limit.
# We just add 100k to the current memory size so that it is
# We just add 100k to the current memory size so that it is
# fast for us to reach that limit.
# fast for us to reach that limit.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment