Commit 5d6fbb2d authored by Per Cederqvist's avatar Per Cederqvist

Updated to match the log messages currently sent by lockdb.c.

parent 2ded400f
...@@ -55,7 +55,7 @@ unset test ...@@ -55,7 +55,7 @@ unset test
spawn ../dbck -d -i config/lyskomd-config spawn ../dbck -d -i config/lyskomd-config
set test "dbck finds a lock" set test "dbck finds a lock"
expect { 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" set test "read-write dbck sent final line"
expect { expect {
...@@ -74,7 +74,11 @@ unset test ...@@ -74,7 +74,11 @@ unset test
spawn ../lyskomd -d config/lyskomd-config spawn ../lyskomd -d config/lyskomd-config
set test "lyskomd finds a lock" set test "lyskomd finds a lock"
expect { 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" set test "read-write lyskomd sent final line"
expect { expect {
...@@ -107,7 +111,7 @@ expect { ...@@ -107,7 +111,7 @@ expect {
set new_pid [spawn ../lyskomd -d config/lyskomd-config] set new_pid [spawn ../lyskomd -d config/lyskomd-config]
set test "stale lock file removed" set test "stale lock file removed"
expect { 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" pass "$test"
} }
} }
...@@ -131,7 +135,7 @@ system "ln -s inet.lysator.liu.se:4711 db/lyskomd-lock" ...@@ -131,7 +135,7 @@ system "ln -s inet.lysator.liu.se:4711 db/lyskomd-lock"
spawn ../lyskomd -d config/lyskomd-config spawn ../lyskomd -d config/lyskomd-config
set test "remote lock file found" set test "remote lock file found"
expect { expect {
-re "Database locked by inet\.lysator\.liu\.se:4711$nl" { -re "Database already locked by inet\.lysator\.liu\.se:4711$nl" {
pass "$test" pass "$test"
} }
} }
......
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