ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-29 15:43:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix servald server test assertion messages

Browse Source
This commit is contained in:
Andrew Bettison 2012-06-22 17:32:42 +09:30
parent dfc8136b11
commit c041048958
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testdefs.sh
View File

@ -28,7 +28,7 @@ setup_servald() {
# - asserts that standard error contains no error messages
executeOk_servald() {
executeOk --executable="$servald" "$@"
assertStderrGrep --matches=0 --message='stderr of $executed contains no error messages' '^ERROR:'
assertStderrGrep --matches=0 --message="stderr of $executed contains no error messages" '^ERROR:'
}
# Utility function:
@ -147,8 +147,8 @@ start_servald_server() {
done
assert --message="a new servald process is running" --dump-on-fail="$instance_servald_log" [ -n "$new_pids" ]
assert --message="servald pidfile process is running" --dump-on-fail="$instance_servald_log" $pidfile_running
echo "# Started servald server process $instance_name, pid=$servald_pid"
assert --message="servald log file $instance_servald_log is present" [ -r "$instance_servald_log" ]
echo "# Started servald server process $instance_name, pid=$servald_pid"
pop_instance
}
@ -292,7 +292,7 @@ assert_no_servald_processes() {
assert_servald_server_no_errors() {
push_instance
set_instance_fromarg "$1" && shift
assertGrep --matches=0 --message='stderr of $servald_basename $instance_name contains no error messages' "$instance_servald_log" '^ERROR:'
assertGrep --matches=0 --message="stderr of $servald_basename $instance_name contains no error messages" "$instance_servald_log" '^ERROR:'
pop_instance
}
@ -303,7 +303,7 @@ assert_all_servald_servers_no_errors() {
if pushd "$TFWTMP/instance" >/dev/null; then
for name in *; do
set_instance "+$name"
assertGrep --matches=0 --message='stderr of $servald_basename $instance_name contains no error messages' "$instance_servald_log" '^ERROR:'
assertGrep --matches=0 --message="stderr of $servald_basename $instance_name contains no error messages" "$instance_servald_log" '^ERROR:'
done
popd >/dev/null
fi

2
tests/server
View File

@ -40,7 +40,9 @@ setup_ServerStartCreateInstanceDir() {
test_ServerStartCreateInstanceDir() {
start_servald_server
assert [ -d "$SERVALINSTANCE_PATH" ]
sleep 0.1
assert_servald_server_no_errors
tfw_cat "$instance_servald_log"
}
runTests "$@"