experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: sleep 0.5s; vagrant centos: ipv6 enable

Browse source
This commit is contained in:
Olof hagsand 2020-11-24 18:29:04 +01:00
parent 8d8a37d18e
commit ccadd3f9ea
5 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
test/lib.sh
View file

@ -113,11 +113,15 @@ DEFAULTNS='xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"'
# Wait after daemons (backend/restconf) start. See mem.sh for valgrind
if [ "$(uname -m)" = "armv7l" ]; then
: ${RCWAIT:=8}
: ${DEMWAIT:=8}
else
: ${RCWAIT:=2}
: ${DEMWAIT:=2}
fi
# Multiplication factor to sleep less than whole seconds
DEMSLEEP=.5
let DEMWAIT*=2;
# RESTCONF protocol, eg http or https
: ${RCPROTO:=http}
@ -276,12 +280,12 @@ wait_backend(){
reply=$(echo '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="101"><ping xmlns="http://clicon.org/lib"/></rpc>]]>]]>' | $clixon_netconf -qef $cfg 2> /dev/null)
let i=0;
while [[ $reply != "<rpc-reply"* ]]; do
sleep 1
sleep $DEMSLEEP
reply=$(echo '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="101" xmlns="http://clicon.org/lib"><ping/></rpc>]]>]]>' | clixon_netconf -qef $cfg 2> /dev/null)
let i++;
# echo "wait_backend $i"
if [ $i -ge $RCWAIT ]; then
err "backend timeout $RCWAIT seconds"
if [ $i -ge $DEMWAIT ]; then
err "backend timeout $DEMWAIT seconds"
fi
done
}
@ -324,13 +328,13 @@ wait_restconf(){
# echo "hdr:\"$hdr\""
let i=0;
while [[ $hdr != *"200 OK"* ]]; do
sleep 1
sleep $DEMSLEEP
hdr=$(curl $CURLOPTS $* $RCPROTO://localhost/restconf)
# echo "hdr:\"$hdr\""
let i++;
# echo "wait_restconf $i"
if [ $i -ge $RCWAIT ]; then
err "restconf timeout $RCWAIT seconds"
if [ $i -ge $DEMWAIT ]; then
err "restconf timeout $DEMWAIT seconds"
fi
done
if [ $valgrindtest -eq 3 ]; then