X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovs-monitor-ipsec.at;h=1a8316129fb879fc1b0c1c09e13041299f3e1abe;hb=1bf6eeb0ac46d32e9a608a9d3ec28d3145f9adf8;hp=ab14462c6f57e8468e155590db5659dd535db6f1;hpb=dfbf7f354416264a0b84b09bf882ac0932e78c8b;p=openvswitch diff --git a/tests/ovs-monitor-ipsec.at b/tests/ovs-monitor-ipsec.at index ab14462c..1a831612 100644 --- a/tests/ovs-monitor-ipsec.at +++ b/tests/ovs-monitor-ipsec.at @@ -3,6 +3,8 @@ AT_BANNER([ovs-monitor-ipsec]) AT_SETUP([ovs-monitor-ipsec]) AT_SKIP_IF([test $HAVE_PYTHON = no]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_PKGDATADIR=`pwd`; export OVS_PKGDATADIR cp "$top_srcdir/vswitchd/vswitch.ovsschema" . @@ -31,7 +33,7 @@ chmod +x usr/sbin/setkey touch etc/racoon/certs/ovs-stale.pem ovs_vsctl () { - ovs-vsctl --timeout=5 --no-wait -vreconnect:ANY:emer --db=unix:socket "$@" + ovs-vsctl --timeout=5 --no-wait -vreconnect:emer --db=unix:socket "$@" } trim () { # Removes blank lines and lines starting with # from input. sed -e '/^#/d' -e '/^[ ]*$/d' "$@" @@ -308,4 +310,6 @@ sainfo anonymous { ]) AT_CHECK([test ! -f etc/racoon/certs/ovs-3.4.5.6.pem]) +OVSDB_SERVER_SHUTDOWN + AT_CLEANUP