Commit dba516ee authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Match all output. Somehow this test didn't fail even though there

were unmatched output from lyskomd.  Strange.
parent 7e3684d3
......@@ -181,25 +181,16 @@ simple_expect "MSG: garb ready. 0 texts deleted."
system "kill -HUP $new_pid"
set bypass 0
set test "non-stale lyskomd sent final line"
simple_expect "Signal HUP received. Shutting down server."
simple_expect "../lyskomd terminated normally."
simple_expect "Press enter to terminate lyskomd"
send "\n"
set test "non-stale lyskomd died"
expect {
-re "^\[0-9 :\]* $new_pid Press enter to terminate lyskomd$nl" {
pass "$test"
}
eof {
fail "$test (unexpected EOF)"
wait
set bypass 1
}
eof { pass "$test"; wait }
}
unset test
if {$bypass == 0} {
send "\n"
set test "non-stale lyskomd died"
expect {
eof { pass "$test"; wait }
}
unset test
}
# Start a new lyskomd while a lock file for a remote system exists.
system "ln -s inet.lysator.liu.se:4711 db/lyskomd-lock"
......@@ -215,6 +206,12 @@ expect {
pass "$test"
}
}
set test "lock complaint"
expect {
-re "^\[0-9 :\]* Cannot obtain database lock. Exiting.$nl" {
pass "$test"
}
}
set test "local lyskomd sent final line"
expect {
-re "^\[0-9 :\]* Press enter to terminate lyskomd$nl" {
......
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