From: Ben Pfaff Date: Fri, 1 Feb 2013 18:26:35 +0000 (-0800) Subject: tests: Fix error path in netflow test. X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~59 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3d6c7773c0ebca6fc6cadaed351331d4aed6fc9b;p=sliver-openvswitch.git tests: Fix error path in netflow test. Otherwise, if the test bails out before finishing, the test-netflow daemon doesn't get killed and the test hangs. Signed-off-by: Ben Pfaff Acked-by: Ethan Jackson --- diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 08645cc8a..8f11b825c 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -1139,7 +1139,7 @@ ovs-vsctl \ --id=@nf create NetFlow targets=\"127.0.0.1:$NETFLOW_PORT\" \ engine_id=1 engine_type=2 active_timeout=10 add-id-to-interface=false -ON_EXIT([kill `test-netflow.pid`]) +ON_EXIT([kill `cat test-netflow.pid`]) AT_CHECK([test-netflow --detach --no-chdir --pidfile $NETFLOW_PORT:127.0.0.1 > netflow.log])AT_CAPTURE_FILE([netflow.log]) AT_CHECK([ovs-appctl time/stop])