X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovs-xapi-sync.at;h=b55eecdb88d4344fc28ed36c059b6c7b23a8318c;hb=003ce655b7116d18c86a74c50391e54990346931;hp=5fa61ec33e0572a4c8cb42bf81ab75eba9f412d5;hpb=ea523221d4b11e9e067ec8b25a3955d1b64eb537;p=sliver-openvswitch.git

diff --git a/tests/ovs-xapi-sync.at b/tests/ovs-xapi-sync.at
index 5fa61ec33..b55eecdb8 100644
--- a/tests/ovs-xapi-sync.at
+++ b/tests/ovs-xapi-sync.at
@@ -9,19 +9,20 @@ PYTHONPATH=`pwd`:$PYTHONPATH
 export PYTHONPATH
 
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+OVS_DBDIR=`pwd`; export OVS_DBDIR
 OVS_PKGDATADIR=`pwd`; export OVS_PKGDATADIR
 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.