git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Try connecting only once for active connections by default.
[sliver-openvswitch.git]
/
tests
/
ovs-monitor-ipsec.at
diff --git
a/tests/ovs-monitor-ipsec.at
b/tests/ovs-monitor-ipsec.at
index
ab14462
..
bd150cf
100644
(file)
--- a/
tests/ovs-monitor-ipsec.at
+++ b/
tests/ovs-monitor-ipsec.at
@@
-3,10
+3,12
@@
AT_BANNER([ovs-monitor-ipsec])
AT_SETUP([ovs-monitor-ipsec])
AT_SKIP_IF([test $HAVE_PYTHON = no])
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" .
OVS_PKGDATADIR=`pwd`; export OVS_PKGDATADIR
cp "$top_srcdir/vswitchd/vswitch.ovsschema" .
-trap 'kill `cat pid ovs-monitor-ipsec.pid`' 0
+ON_EXIT([kill `cat pid ovs-monitor-ipsec.pid`])
mkdir etc etc/init.d etc/racoon etc/racoon/certs
mkdir usr usr/sbin
mkdir etc etc/init.d etc/racoon etc/racoon/certs
mkdir usr usr/sbin
@@
-31,7
+33,7
@@
chmod +x usr/sbin/setkey
touch etc/racoon/certs/ovs-stale.pem
ovs_vsctl () {
touch etc/racoon/certs/ovs-stale.pem
ovs_vsctl () {
- ovs-vsctl --
timeout=5 --no-wait -vreconnect:ANY
:emer --db=unix:socket "$@"
+ ovs-vsctl --
no-wait -vreconnect
:emer --db=unix:socket "$@"
}
trim () { # Removes blank lines and lines starting with # from input.
sed -e '/^#/d' -e '/^[ ]*$/d' "$@"
}
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])
])
AT_CHECK([test ! -f etc/racoon/certs/ovs-3.4.5.6.pem])
+OVSDB_SERVER_SHUTDOWN
+
AT_CLEANUP
AT_CLEANUP