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

Fixing specs!

Browse Source
This commit is contained in:
Ivan Ilves 2017-07-14 17:39:33 +02:00
parent e61b0d2777
commit 2540ae689a
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/integration/cases/do_client_teardown.sh
View File

@ -1,3 +1,5 @@
sleep 2
function get_client_links(){ function get_client_links(){
ip link | egrep "tun[0-9]{1,2}" | cut -f2 -d' ' | tr '\n' ' ' ip link | egrep "tun[0-9]{1,2}" | cut -f2 -d' ' | tr '\n' ' '
} }
@ -7,7 +9,7 @@ DOWN_DELAY=2
ORIG_LINKS=$(get_client_links) ORIG_LINKS=$(get_client_links)
${XIRI_EXE} -X -R ${SSH_USER}@${REMOTE_IP} & ${XIRI_EXE} -X ${SSH_USER}@${REMOTE_IP} &
XIRI_PID=${!}; sleep ${INIT_DELAY} XIRI_PID=${!}; sleep ${INIT_DELAY}
NEW_LINKS=$(get_client_links) NEW_LINKS=$(get_client_links)

6
testing/integration/cases/do_server_teardown.sh
View File

@ -3,17 +3,17 @@ function get_server_links(){
| egrep "tun[0-9]{1,2}" | cut -f2 -d' ' | tr '\n' ' ' | egrep "tun[0-9]{1,2}" | cut -f2 -d' ' | tr '\n' ' '
} }
INIT_DELAY=10 INIT_DELAY=5
DOWN_DELAY=10 DOWN_DELAY=10
ORIG_LINKS=$(get_server_links) ORIG_LINKS=$(get_server_links)
${XIRI_EXE} -f 1 -X -R ${SSH_USER}@${REMOTE_IP} & ${XIRI_EXE} -f 1 -X ${SSH_USER}@${REMOTE_IP} &
XIRI_PID=${!}; sleep ${INIT_DELAY} XIRI_PID=${!}; sleep ${INIT_DELAY}
NEW_LINKS=$(get_server_links) NEW_LINKS=$(get_server_links)
kill_reliably ${XIRI_PID} ${DOWN_DELAY} kill_reliably ${XIRI_PID} ${DOWN_DELAY}
sleep 10
FINAL_LINKS=$(get_server_links) FINAL_LINKS=$(get_server_links)
if [[ "${ORIG_LINKS}" == "${NEW_LINKS}" ]]; then if [[ "${ORIG_LINKS}" == "${NEW_LINKS}" ]]; then

2
testing/integration/cases/run_with_dns_propagation.sh
View File

@ -4,7 +4,7 @@ DOWN_DELAY=20
ORIG_RESOLV_CONF=$(cat /etc/resolv.conf) ORIG_RESOLV_CONF=$(cat /etc/resolv.conf)
warn "${ORIG_RESOLV_CONF}" warn "${ORIG_RESOLV_CONF}"
${XIRI_EXE} -f 1 -X -R ${SSH_USER}@${REMOTE_IP} 10.245.245.245/32 & ${XIRI_EXE} -f 1 -X ${SSH_USER}@${REMOTE_IP} 10.245.245.245/32 &
XIRI_PID=${!}; sleep ${INIT_DELAY} XIRI_PID=${!}; sleep ${INIT_DELAY}
NEW_RESOLV_CONF=$(cat /etc/resolv.conf) NEW_RESOLV_CONF=$(cat /etc/resolv.conf)

2
testing/integration/cases/run_without_dns_propagation.sh
View File

@ -4,7 +4,7 @@ DOWN_DELAY=20
ORIG_RESOLV_CONF=$(cat /etc/resolv.conf) ORIG_RESOLV_CONF=$(cat /etc/resolv.conf)
warn "${ORIG_RESOLV_CONF}" warn "${ORIG_RESOLV_CONF}"
${XIRI_EXE} -f 1 -X -R -D ${SSH_USER}@${REMOTE_IP} 10.245.245.245/32 & ${XIRI_EXE} -X -D ${SSH_USER}@${REMOTE_IP} 10.245.245.245/32 &
XIRI_PID=${!}; sleep ${INIT_DELAY} XIRI_PID=${!}; sleep ${INIT_DELAY}
NEW_RESOLV_CONF=$(cat /etc/resolv.conf) NEW_RESOLV_CONF=$(cat /etc/resolv.conf)

2
testing/integration/cases/xaval.sh
View File

@ -47,8 +47,6 @@ if [[ "$(cat ${PROFILE_DIR}/${PROFILE})" != "-X ${SSH_USER}@${REMOTE_IP}" ]]; th
exit 1 exit 1
fi fi
${WD}/xaval connect ${PROFILE}
${WD}/xaval delete ${PROFILE} ${WD}/xaval delete ${PROFILE}
if [[ -f "${PROFILE_DIR}/${PROFILE}" ]]; then if [[ -f "${PROFILE_DIR}/${PROFILE}" ]]; then
complain "Xaval has not deleted profile file: ${PROFILE_DIR}/${PROFILE}" complain "Xaval has not deleted profile file: ${PROFILE_DIR}/${PROFILE}"

4
testing/run_integration_case.sh
View File

@ -30,13 +30,15 @@ function kill_reliably(){
sleep 1 sleep 1
let TIME_PASSED+=1 let TIME_PASSED+=1
else else
return sleep 2
return 0
fi fi
done done
if [[ $(ps -p ${TARGET_PID} | wc -l) -eq 2 ]]; then if [[ $(ps -p ${TARGET_PID} | wc -l) -eq 2 ]]; then
kill -9 ${TARGET_PID} &>/dev/null kill -9 ${TARGET_PID} &>/dev/null
sleep 1 sleep 1
fi fi
sleep 2
} }
function warn(){ function warn(){