Commit 8318d739 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Use TERM instead of HUP to shut down lyskomd.

parent 84a23461
......@@ -186,6 +186,6 @@ simple_expect "%%LysKOM unsupported protocol\\."
client_death 8
# Test shutdown via a signal
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death "" signal
......@@ -111,7 +111,7 @@ expect {
unset test
# Shut down lyskomd.
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death "" signal
# Start a new lyskomd.
......@@ -178,10 +178,10 @@ simple_expect "Read 6 confs/persons and 1 texts"
simple_expect "MSG: garb started."
simple_expect "MSG: garb ready. 0 texts deleted."
system "kill -HUP $new_pid"
system "kill -TERM $new_pid"
set bypass 0
set test "non-stale lyskomd sent final line"
simple_expect "Signal HUP received. Shutting down server."
simple_expect "Signal TERM received. Shutting down server."
simple_expect "../lyskomd terminated normally."
simple_expect "Press enter to terminate lyskomd"
......
......@@ -489,6 +489,6 @@ set_read_2 "3 { 8 11 15 15 19 21 }" "2 { 7 15 17 23 }"
set_read_2 "2 { 10 11 15 15 }" "1 { 10 15 }"
set_read_2 "2 { 10 12 15 15 }" "1 { 10 15 }"
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
client_death 0
lyskomd_death "" signal
......@@ -98,7 +98,7 @@ if {$debug_calls == 0} {
simple_expect "=1"
}
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
client_death 0
lyskomd_death "" signal
......@@ -178,7 +178,7 @@ if {$debug_calls} {
simple_expect "=1"
}
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
client_death 0
lyskomd_death "" signal
......
......@@ -202,6 +202,6 @@ talk_to client 0
send "1000 112 [holl "recv-queue-bytes"]\n"
simple_expect "=1000 6 { $any_num 0 0 $any_float $any_float $any_float $any_float $any_float $any_float $any_float $any_float $any_float $any_float $any_float $any_float $any_float $any_float $any_float }"
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
client_death 0
lyskomd_death "" signal
......@@ -56,7 +56,7 @@ client_death 1
lyskomd_expect "Client 3 from $any* has been idle too long\. Killing it\."
client_death 2
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death "" signal
# =========================================================================
......@@ -97,7 +97,7 @@ talk_to client 2
send "1007 35 \n"
simple_expect "=1007 $any_time"
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death "" signal
client_death 1
client_death 2
......@@ -140,7 +140,7 @@ talk_to client 2
send "1011 35 \n"
simple_expect "=1011 $any_time"
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death "" signal
client_death 0
client_death 2
......@@ -183,7 +183,7 @@ talk_to client 1
send "1015 35 \n"
simple_expect "=1015 $any_time"
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death "" signal
client_death 0
client_death 1
......@@ -96,7 +96,7 @@ send "1014 9 5 6\n"
simple_expect "%1014 9 6"
# Shut everything down.
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death {} signal
client_death 0
......@@ -64,7 +64,7 @@ proc start {} {
proc stop {} {
global lyskomd_pid
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death {} signal
client_death 0
}
......
......@@ -84,7 +84,7 @@ good_bad_expect "=1008 3" "=1"
send "1009 86 [holl "text 2 after"] 1 { 0 $ca } 0 { }\n"
good_bad_expect "=1009 4" "=2"
system "kill -HUP $lyskomd_pid"
system "kill -TERM $lyskomd_pid"
lyskomd_death {} signal
client_death 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment