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
ofproto: Inline trivial functions.
[sliver-openvswitch.git]
/
tests
/
ovs-monitor-ipsec.at
diff --git
a/tests/ovs-monitor-ipsec.at
b/tests/ovs-monitor-ipsec.at
index
f9868e7
..
67705fa
100644
(file)
--- a/
tests/ovs-monitor-ipsec.at
+++ b/
tests/ovs-monitor-ipsec.at
@@
-2,11
+2,14
@@
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])
+AT_SKIP_IF([$non_ascii_cwd])
+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
+34,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' "$@"
@@
-238,7
+241,7
@@
AT_CHECK([ovs_vsctl set-ssl /ssl-key.pem /ssl-cert.pem /ssl-cacert.pem \
-----END CERTIFICATE-----
"' \
options:use_ssl_cert='"true"'])
-----END CERTIFICATE-----
"' \
options:use_ssl_cert='"true"'])
-OVS_WAIT_UNTIL([test `wc -l < actions` -ge
21
])
+OVS_WAIT_UNTIL([test `wc -l < actions` -ge
33
])
AT_CHECK([sed '1,29d' actions], [0], [dnl
racoon: reload
setkey:
AT_CHECK([sed '1,29d' actions], [0], [dnl
racoon: reload
setkey:
@@
-283,7
+286,7
@@
AT_CHECK([cat etc/racoon/certs/ovs-3.4.5.6.pem], [0], [dnl
### Delete the SSL certificate interface.
###
AT_CHECK([ovs_vsctl del-port gre2])
### Delete the SSL certificate interface.
###
AT_CHECK([ovs_vsctl del-port gre2])
-OVS_WAIT_UNTIL([test `wc -l < actions` -ge
29
])
+OVS_WAIT_UNTIL([test `wc -l < actions` -ge
41
])
AT_CHECK([sed '1,33d' actions], [0], [dnl
racoon: reload
setkey:
AT_CHECK([sed '1,33d' actions], [0], [dnl
racoon: reload
setkey:
@@
-308,4
+311,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