Commit 25a6220e authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(client_start_fail): Don't call wait from expect_always code. It

	would wait on the wrong process.
(client_start_fail): Ditto.
(get_time_client_start): Ditto.
parent e5ff4371
......@@ -1033,7 +1033,7 @@ proc client_start {nr} {
set client_id($nr) $spawn_id
set expect_active($client_id($nr)) " -i $client_id($nr) -re \"($deep_any*)$nl\" { fail \"\$test (unexpected line \$expect_out(1,string))\"; exp_continue } timeout { fail \"\$test (timeout on client $nr)\" }"
set expect_always($client_id($nr)) \
" -i $client_id($nr) eof { fail \"\$test (eof on client$nr)\"; wait } -i $client_id($nr) full_buffer { fail \"\$test (full_buffer on client$nr)\" } "
" -i $client_id($nr) eof { fail \"\$test (eof on client$nr)\" } -i $client_id($nr) full_buffer { fail \"\$test (full_buffer on client$nr)\" } "
talk_to client $nr
......@@ -1059,7 +1059,7 @@ proc client_start_fail {nr {response ""}} {
set client_id($nr) $spawn_id
set expect_active($client_id($nr)) " -i $client_id($nr) -re \"($deep_any*)$nl\" { fail \"\$test (unexpected line \$expect_out(1,string))\"; exp_continue } timeout { fail \"\$test (timeout on client $nr)\" }"
set expect_always($client_id($nr)) \
" -i $client_id($nr) eof { fail \"\$test (eof on client$nr)\"; wait } -i $client_id($nr) full_buffer { fail \"\$test (full_buffer on client$nr)\" } "
" -i $client_id($nr) eof { fail \"\$test (eof on client$nr)\" } -i $client_id($nr) full_buffer { fail \"\$test (full_buffer on client$nr)\" } "
talk_to client $nr
......@@ -1199,7 +1199,7 @@ proc get_time_client_start {nr args} {
set get_time_client_id($nr) $spawn_id
set expect_active($get_time_client_id($nr)) " -i $get_time_client_id($nr) -re \"($deep_any*)$nl\" { fail \"\$test (unexpected line \$expect_out(1,string))\"; exp_continue } timeout { fail \"\$test (timeout on get_time_client $nr)\" }"
set expect_always($get_time_client_id($nr)) \
" -i $get_time_client_id($nr) eof { fail \"\$test (eof on get_time_client $nr)\"; wait } -i $get_time_client_id($nr) full_buffer { fail \"\$test (full_buffer on get_time_client $nr)\" } "
" -i $get_time_client_id($nr) eof { fail \"\$test (eof on get_time_client $nr)\" } -i $get_time_client_id($nr) full_buffer { fail \"\$test (full_buffer on get_time_client $nr)\" } "
talk_to get_time_client $nr
......
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