X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovs-xapi-sync.at;h=b55eecdb88d4344fc28ed36c059b6c7b23a8318c;hb=fba6bd1d3f5891471daea8bf5da22303c2d889df;hp=25acc743722e3881e724a72611a7b672fab2c503;hpb=f973f2af2fd4452c8e182caf6a4346cf2a2a394e;p=sliver-openvswitch.git

diff --git a/tests/ovs-xapi-sync.at b/tests/ovs-xapi-sync.at
index 25acc7437..b55eecdb8 100644
--- a/tests/ovs-xapi-sync.at
+++ b/tests/ovs-xapi-sync.at
@@ -16,13 +16,13 @@ cp "$top_srcdir/vswitchd/vswitch.ovsschema" .
 cp "$top_srcdir/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync" \
    ovs-xapi-sync
 
-trap 'kill `cat pid ovs-xapi-sync.pid`' 0
+ON_EXIT([kill `cat pid ovs-xapi-sync.pid`])
 
 mkdir var var/run
 touch var/run/xapi_init_complete.cookie
 
 ovs_vsctl () {
-    ovs-vsctl --timeout=5 --no-wait -vreconnect:emer --db=unix:socket "$@"
+    ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket "$@"
 }
 
 # Start ovsdb-server.