diff --git a/src/server/testsuite/lyskomd.0/11.exp b/src/server/testsuite/lyskomd.0/11.exp index 0d23c679d428a79e6c89cfa4461230557eed31f3..035a8206f7ea170984a6726b8f502c45f596d36c 100644 --- a/src/server/testsuite/lyskomd.0/11.exp +++ b/src/server/testsuite/lyskomd.0/11.exp @@ -55,7 +55,7 @@ unset test spawn ../dbck -d -i config/lyskomd-config set test "dbck finds a lock" expect { - -re "^Database locked by $any*\.$nl" { pass "$test" } + -re "^Database already locked by $any*\.$nl" { pass "$test" } } set test "read-write dbck sent final line" expect { @@ -74,7 +74,11 @@ unset test spawn ../lyskomd -d config/lyskomd-config set test "lyskomd finds a lock" expect { - -re "Database locked by $any*:$lyskomd_pid$nl" { pass "$test" } + -re "Database already locked by $any*:$lyskomd_pid$nl" { pass "$test" } +} +set test "lyskomd writes an exiting message." +expect { + -re "Cannot obtain database lock\. Exiting\.$nl" { pass "$test" } } set test "read-write lyskomd sent final line" expect { @@ -107,7 +111,7 @@ expect { set new_pid [spawn ../lyskomd -d config/lyskomd-config] set test "stale lock file removed" expect { - -re " $new_pid Stale lock file left by $any*:$lyskomd_pid removed\.$nl" { + -re " $new_pid Removed stale lock file left by $any*:$lyskomd_pid\.$nl" { pass "$test" } } @@ -131,7 +135,7 @@ system "ln -s inet.lysator.liu.se:4711 db/lyskomd-lock" spawn ../lyskomd -d config/lyskomd-config set test "remote lock file found" expect { - -re "Database locked by inet\.lysator\.liu\.se:4711$nl" { + -re "Database already locked by inet\.lysator\.liu\.se:4711$nl" { pass "$test" } }