Check all output from lyskomd. Closes bug 692.

src/server/testsuite/lyskomd.0/18.exp

@@ -53,9 +53,7 @@ send "1002 96\n"
 simple_expect "=1002 39 { 10003 10002 10001 10000 4000 3002 3001 3000 2007 2006 2005 2004 2003 2002 2001 2000 1022 1021 1020 1019 1018 1017 1016 1015 1014 1013 1012 1011 1010 1009 1008 1007 1006 1005 1004 1003 1002 1001 1000 }"
 
 system "kill -WINCH $lyskomd_pid"
-
-# FIXME (bug 692): Race condition: allow lyskomd time to process the signal.
-sleep 1
+lyskomd_expect "Signal WINCH received. aux definitions reloaded."
 
 send "1003 96\n"
 simple_expect "=1003 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"
@@ -66,42 +64,32 @@ simple_expect "=1004 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27
 copy_aux $srcdir/lyskomd.0/aux-items.conf
 
 system "kill -WINCH $lyskomd_pid"
-
-# FIXME (bug 692): Race condition: allow lyskomd time to process the signal.
-sleep 1
+lyskomd_expect "Signal WINCH received. aux definitions reloaded."
 
 send "1005 96\n"
 simple_expect "=1005 39 { 10003 10002 10001 10000 4000 3002 3001 3000 2007 2006 2005 2004 2003 2002 2001 2000 1022 1021 1020 1019 1018 1017 1016 1015 1014 1013 1012 1011 1010 1009 1008 1007 1006 1005 1004 1003 1002 1001 1000 }"
 
 system "kill -WINCH $lyskomd_pid"
-
-# FIXME (bug 692): Race condition: allow lyskomd time to process the signal.
-sleep 1
+lyskomd_expect "Signal WINCH received. aux definitions reloaded."
 
 send "1006 96\n"
 simple_expect "=1006 39 { 10003 10002 10001 10000 4000 3002 3001 3000 2007 2006 2005 2004 2003 2002 2001 2000 1022 1021 1020 1019 1018 1017 1016 1015 1014 1013 1012 1011 1010 1009 1008 1007 1006 1005 1004 1003 1002 1001 1000 }"
 
 system "kill -WINCH $lyskomd_pid"
-
-# FIXME (bug 692): Race condition: allow lyskomd time to process the signal.
-sleep 1
+lyskomd_expect "Signal WINCH received. aux definitions reloaded."
 
 send "1007 96\n"
 simple_expect "=1007 39 { 10003 10002 10001 10000 4000 3002 3001 3000 2007 2006 2005 2004 2003 2002 2001 2000 1022 1021 1020 1019 1018 1017 1016 1015 1014 1013 1012 1011 1010 1009 1008 1007 1006 1005 1004 1003 1002 1001 1000 }"
 
 system "kill -WINCH $lyskomd_pid"
-
-# FIXME (bug 692): Race condition: allow lyskomd time to process the signal.
-sleep 1
+lyskomd_expect "Signal WINCH received. aux definitions reloaded."
 
 send "1008 96\n"
 simple_expect "=1008 39 { 10003 10002 10001 10000 4000 3002 3001 3000 2007 2006 2005 2004 2003 2002 2001 2000 1022 1021 1020 1019 1018 1017 1016 1015 1014 1013 1012 1011 1010 1009 1008 1007 1006 1005 1004 1003 1002 1001 1000 }"
 
 copy_aux $aux_item_default_conf_file
 system "kill -WINCH $lyskomd_pid"
-
-# FIXME (bug 692): Race condition: allow lyskomd time to process the signal.
-sleep 1
+lyskomd_expect "Signal WINCH received. aux definitions reloaded."
 
 send "1009 96\n"
 simple_expect "=1009 39 { 10104 10103 10102 10101 10100 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 }"