v/xiringuito
1
0
Fork 0
mirror of https://github.com/ivanilves/xiringuito.git synced 2025-06-01 06:50:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make faster: run_with_route_discovery

Browse Source
This commit is contained in:
Ivan Ilves 2017-07-18 09:48:36 +02:00
parent cc976db8f9
commit f511f989d8
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
testing/integration/cases/run_with_route_discovery.sh
View File

@ -1,22 +1,25 @@
INIT_DELAY=15 INIT_DELAY=20
DOWN_DELAY=5 DOWN_DELAY=10
POST_DELAY=5 POST_DELAY=2
MOCKED_ROUTE=10.42.42.0/30
if [[ -f ${WD}/discover-routes ]]; then if [[ -f ${WD}/discover-routes ]]; then
mv ${WD}/discover-routes /tmp/discover-routes.orig mv ${WD}/discover-routes /tmp/discover-routes.orig
fi fi
echo '#!/bin/sh' >${WD}/discover-routes echo '#!/bin/sh' >${WD}/discover-routes
echo 'echo ROUTE:10.42.42.42/32' >>${WD}/discover-routes echo "echo ROUTE:${MOCKED_ROUTE}" >>${WD}/discover-routes
chmod +x ${WD}/discover-routes chmod +x ${WD}/discover-routes
${XIRI_EXE} -f 1 ${SSH_USER}@${REMOTE_IP} & ${XIRI_EXE} ${SSH_USER}@${REMOTE_IP} &
XIRI_PID=${!}; sleep ${INIT_DELAY} XIRI_PID=${!}
set +e
warn "$(ip route | grep 10.42.42.42)" wait_for true ${INIT_DELAY} "ip route | grep ${MOCKED_ROUTE}"
if [[ -z "$(ip route | grep 10.42.42.42)" ]]; then if [[ ${?} -ne 0 ]]; then
complain "Route not added by route discovery: 10.42.42.42/32" complain "Route not added by route discovery: ${MOCKED_ROUTE}"
exit 1 exit 1
fi fi
set -e
rm ${WD}/discover-routes rm ${WD}/discover-routes
if [[ -f /tmp/discover-routes.orig ]]; then if [[ -f /tmp/discover-routes.orig ]]; then

16
testing/integration/cases/run_without_route_discovery.sh
View File

@ -1,18 +1,22 @@
INIT_DELAY=15 INIT_DELAY=20
DOWN_DELAY=5 DOWN_DELAY=10
POST_DELAY=5 POST_DELAY=5
MOCKED_ROUTE=10.42.42.0/30
if [[ -f ${WD}/discover-routes ]]; then if [[ -f ${WD}/discover-routes ]]; then
mv ${WD}/discover-routes /tmp/discover-routes.orig mv ${WD}/discover-routes /tmp/discover-routes.orig
fi fi
${XIRI_EXE} -f 1 -X ${SSH_USER}@${REMOTE_IP} & ${XIRI_EXE} -f 3 -X ${SSH_USER}@${REMOTE_IP} &
XIRI_PID=${!} XIRI_PID=${!}
wait_for true ${INIT_DELAY} pgrep -f -- "-w.*${SSH_USER}@${REMOTE_IP}" wait_for true ${INIT_DELAY} pgrep -f -- "-w.*${SSH_USER}@${REMOTE_IP}"
warn "$(ip route | grep 10.42.42.42)" sleep ${POST_DELAY}
if [[ -n "$(ip route | grep 10.42.42.42)" ]]; then
complain "Route added by (non-existing) route discovery: 10.42.42.42/32" warn "$(ip route | grep ${MOCKED_ROUTE})"
if [[ -n "$(ip route | grep ${MOCKED_ROUTE})" ]]; then
complain "Route added by (non-existing) route discovery: ${MOCKED_ROUTE}"
exit 1 exit 1
fi fi