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

fix test sleep/loop problem

Browse source
This commit is contained in:
Olof hagsand 2020-11-24 22:29:48 +01:00
parent ccadd3f9ea
commit 4f5b0178cc
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/lib.sh
View file

@ -120,7 +120,9 @@ fi
# Multiplication factor to sleep less than whole seconds # Multiplication factor to sleep less than whole seconds
DEMSLEEP=.5 DEMSLEEP=.5
let DEMWAIT*=2;
# DEMWAIT is expressed in seconds, but really * DEMSLEEP
let DEMLOOP=2*DEMWAIT
# RESTCONF protocol, eg http or https # RESTCONF protocol, eg http or https
: ${RCPROTO:=http} : ${RCPROTO:=http}
@ -284,7 +286,7 @@ wait_backend(){
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) 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++; let i++;
# echo "wait_backend $i" # echo "wait_backend $i"
if [ $i -ge $DEMWAIT ]; then if [ $i -ge $DEMLOOP ]; then
err "backend timeout $DEMWAIT seconds" err "backend timeout $DEMWAIT seconds"
fi fi
done done
@ -333,7 +335,7 @@ wait_restconf(){
# echo "hdr:\"$hdr\"" # echo "hdr:\"$hdr\""
let i++; let i++;
# echo "wait_restconf $i" # echo "wait_restconf $i"
if [ $i -ge $DEMWAIT ]; then if [ $i -ge $DEMLOOP ]; then
err "restconf timeout $DEMWAIT seconds" err "restconf timeout $DEMWAIT seconds"
fi fi
done done