diff options
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/aofrw.tcl | 2 | ||||
| -rw-r--r-- | tests/unit/client-eviction.tcl | 4 | ||||
| -rw-r--r-- | tests/unit/cluster/cli.tcl | 4 | ||||
| -rw-r--r-- | tests/unit/cluster/links.tcl | 4 | ||||
| -rw-r--r-- | tests/unit/maxmemory.tcl | 4 | ||||
| -rw-r--r-- | tests/unit/moduleapi/cluster.tcl | 4 | ||||
| -rw-r--r-- | tests/unit/wait.tcl | 24 |
7 files changed, 23 insertions, 23 deletions
diff --git a/tests/unit/aofrw.tcl b/tests/unit/aofrw.tcl index fe07351a3..cc7545265 100644 --- a/tests/unit/aofrw.tcl +++ b/tests/unit/aofrw.tcl @@ -1,6 +1,6 @@ # This unit has the potential to create huge .reqres files, causing log-req-res-validator.py to run for a very long time... # Since this unit doesn't do anything worth validating, reply_schema-wise, we decided to skip it -start_server {tags {"aofrw external:skip logreqres:skip"}} { +start_server {tags {"aofrw external:skip logreqres:skip"} overrides {save {}}} { # Enable the AOF r config set appendonly yes r config set auto-aof-rewrite-percentage 0 ; # Disable auto-rewrite. diff --git a/tests/unit/client-eviction.tcl b/tests/unit/client-eviction.tcl index 76f7bf0f2..1fc7c02ca 100644 --- a/tests/unit/client-eviction.tcl +++ b/tests/unit/client-eviction.tcl @@ -347,12 +347,12 @@ start_server {} { # We use two obuf-clients to make sure that even if client eviction is attempted # between two command processing (with no sleep) we don't perform any client eviction # because the obuf limit is enforced with precedence. - exec kill -SIGSTOP $server_pid + pause_process $server_pid $rr2 get k $rr2 flush $rr3 get k $rr3 flush - exec kill -SIGCONT $server_pid + resume_process $server_pid r ping ;# make sure a full event loop cycle is processed before issuing CLIENT LIST # Validate obuf-clients were disconnected (because of obuf limit) diff --git a/tests/unit/cluster/cli.tcl b/tests/unit/cluster/cli.tcl index 7131ee20f..3e7f1bedb 100644 --- a/tests/unit/cluster/cli.tcl +++ b/tests/unit/cluster/cli.tcl @@ -116,7 +116,7 @@ start_multiple_servers 3 [list overrides $base_conf] { test "Kill a cluster node and wait for fail state" { # kill node3 in cluster - exec kill -SIGSTOP $node3_pid + pause_process $node3_pid wait_for_condition 1000 50 { [CI 0 cluster_state] eq {fail} && @@ -134,7 +134,7 @@ start_multiple_servers 3 [list overrides $base_conf] { assert_equal [s -1 blocked_clients] {0} } - exec kill -SIGCONT $node3_pid + resume_process $node3_pid $node1_rd close } ;# stop servers diff --git a/tests/unit/cluster/links.tcl b/tests/unit/cluster/links.tcl index 63c2b143c..a202c378b 100644 --- a/tests/unit/cluster/links.tcl +++ b/tests/unit/cluster/links.tcl @@ -200,7 +200,7 @@ start_cluster 3 0 {tags {external:skip cluster}} { # To manufacture an ever-growing send buffer from primary1 to primary2, # make primary2 unresponsive. set primary2_pid [srv [expr -1*$primary2_id] pid] - exec kill -SIGSTOP $primary2_pid + pause_process $primary2_pid # On primary1, send 128KB Pubsub messages in a loop until the send buffer of the link from # primary1 to primary2 exceeds buffer limit therefore be dropped. @@ -226,7 +226,7 @@ start_cluster 3 0 {tags {external:skip cluster}} { assert {[dict get $same_link_p1_from_p2 create-time] eq [dict get $orig_link_p1_from_p2 create-time]} # Revive primary2 - exec kill -SIGCONT $primary2_pid + resume_process $primary2_pid # Reset configs on primary1 so config changes don't leak out to other tests $primary1 CONFIG set cluster-node-timeout $oldtimeout diff --git a/tests/unit/maxmemory.tcl b/tests/unit/maxmemory.tcl index 564250f2e..54aba6715 100644 --- a/tests/unit/maxmemory.tcl +++ b/tests/unit/maxmemory.tcl @@ -350,7 +350,7 @@ proc test_slave_buffers {test_name cmd_count payload_len limit_memory pipeline} # put the slave to sleep set rd_slave [redis_deferring_client] - exec kill -SIGSTOP $slave_pid + pause_process $slave_pid # send some 10mb worth of commands that don't increase the memory usage if {$pipeline == 1} { @@ -399,7 +399,7 @@ proc test_slave_buffers {test_name cmd_count payload_len limit_memory pipeline} } # unfreeze slave process (after the 'test' succeeded or failed, but before we attempt to terminate the server - exec kill -SIGCONT $slave_pid + resume_process $slave_pid } } } diff --git a/tests/unit/moduleapi/cluster.tcl b/tests/unit/moduleapi/cluster.tcl index 43356f77d..807508387 100644 --- a/tests/unit/moduleapi/cluster.tcl +++ b/tests/unit/moduleapi/cluster.tcl @@ -132,7 +132,7 @@ start_cluster 3 0 [list config_lines $modules] { test "Kill a cluster node and wait for fail state" { # kill node3 in cluster - exec kill -SIGSTOP $node3_pid + pause_process $node3_pid wait_for_condition 1000 50 { [CI 0 cluster_state] eq {fail} && @@ -158,7 +158,7 @@ start_cluster 3 0 [list config_lines $modules] { assert_error "ERR Can not execute a command 'set' while the cluster is down" {$node1 do_rm_call set x 1} } - exec kill -SIGCONT $node3_pid + resume_process $node3_pid $node1_rd close $node2_rd close } diff --git a/tests/unit/wait.tcl b/tests/unit/wait.tcl index af13a3374..8c6010afb 100644 --- a/tests/unit/wait.tcl +++ b/tests/unit/wait.tcl @@ -47,25 +47,25 @@ start_server {} { } test {WAIT should not acknowledge 1 additional copy if slave is blocked} { - exec kill -SIGSTOP $slave_pid + pause_process $slave_pid $master set foo 0 $master incr foo $master incr foo $master incr foo assert {[$master wait 1 1000] == 0} - exec kill -SIGCONT $slave_pid + resume_process $slave_pid assert {[$master wait 1 1000] == 1} } test {WAIT implicitly blocks on client pause since ACKs aren't sent} { - exec kill -SIGSTOP $slave_pid + pause_process $slave_pid $master multi $master incr foo $master client pause 10000 write $master exec assert {[$master wait 1 1000] == 0} $master client unpause - exec kill -SIGCONT $slave_pid + resume_process $slave_pid assert {[$master wait 1 1000] == 1} } @@ -73,7 +73,7 @@ start_server {} { set rd [redis_deferring_client -1] set rd2 [redis_deferring_client -1] - exec kill -SIGSTOP $slave_pid + pause_process $slave_pid $rd incr foo $rd read @@ -85,7 +85,7 @@ start_server {} { $rd2 wait 1 0 wait_for_blocked_clients_count 2 100 10 -1 - exec kill -SIGCONT $slave_pid + resume_process $slave_pid assert_equal [$rd read] {1} assert_equal [$rd2 read] {1} @@ -229,10 +229,10 @@ tags {"wait aof network external:skip"} { } test {WAITAOF replica copy if replica is blocked} { - exec kill -SIGSTOP $replica_pid + pause_process $replica_pid $master incr foo assert_equal [$master waitaof 0 1 50] {1 0} ;# exits on timeout - exec kill -SIGCONT $replica_pid + resume_process $replica_pid assert_equal [$master waitaof 0 1 0] {1 1} } @@ -240,7 +240,7 @@ tags {"wait aof network external:skip"} { set rd [redis_deferring_client -1] set rd2 [redis_deferring_client -1] - exec kill -SIGSTOP $replica_pid + pause_process $replica_pid $rd incr foo $rd read @@ -252,7 +252,7 @@ tags {"wait aof network external:skip"} { $rd2 waitaof 0 1 0 wait_for_blocked_clients_count 2 100 10 -1 - exec kill -SIGCONT $replica_pid + resume_process $replica_pid assert_equal [$rd read] {1 1} assert_equal [$rd2 read] {1 1} @@ -438,7 +438,7 @@ start_server {} { waitForBgrewriteaof $replica1 waitForBgrewriteaof $replica2 - exec kill -SIGSTOP $replica1_pid + pause_process $replica1_pid $rd incr foo $rd read @@ -451,7 +451,7 @@ start_server {} { wait_for_blocked_clients_count 2 - exec kill -SIGCONT $replica1_pid + resume_process $replica1_pid # WAIT will unblock the client first. assert_equal [$rd2 read] {2} |