[ovs-dev] [test log scan v2 1/6] tests: Fix error path in netflow test.

Ethan Jackson ethan at nicira.com
Tue Feb 5 20:59:02 UTC 2013


Acked-by: Ethan Jackson <ethan at nicira.com>

On Fri, Feb 1, 2013 at 10:48 AM, Ben Pfaff <blp at nicira.com> wrote:
> 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 <blp at nicira.com>
> ---
>  tests/ofproto-dpif.at |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
> index 3eec947..f007381 100644
> --- a/tests/ofproto-dpif.at
> +++ b/tests/ofproto-dpif.at
> @@ -1010,7 +1010,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])
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev



More information about the dev mailing list