diff --git a/test/lib.sh b/test/lib.sh index 36d3ee40..e7ab45ed 100755 --- a/test/lib.sh +++ b/test/lib.sh @@ -554,7 +554,7 @@ function stop_backend(){ sleep 1 checkvalgrind fi - sudo pkill -f clixon_backend # extra ($BUSER?) +# sudo pkill -f clixon_backend # extra ($BUSER?) } # Wait for restconf to stop sending 502 Bad Gateway @@ -638,7 +638,7 @@ function wait_restconf(){ sleep 2 # some problems with valgrind fi - stty $STTYSETTINGS + stty $STTYSETTINGS >/dev/null } # Wait for restconf to stop diff --git a/test/test_restconf_internal.sh b/test/test_restconf_internal.sh index c81ec7b1..e29c0922 100755 --- a/test/test_restconf_internal.sh +++ b/test/test_restconf_internal.sh @@ -115,7 +115,7 @@ EOF err "No pid return value" "$retx" fi if $active; then - expect="^$activeClixon RESTCONF process/.*/clixon_restconf -f $cfg -D [0-9] .*$status20[0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9]*Z$pid$" + expect="^$activeClixon RESTCONF process/.*/clixon_restconf -f $cfg -D [0-9] .*$status20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9]*Z$pid$" else # inactive, no startime or pid expect="^$activeClixon RESTCONF process/.*/clixon_restconf -f $cfg -D [0-9] .*$status$" @@ -320,6 +320,7 @@ if [ $BE -ne 0 ]; then fi # kill backend stop_backend -f $cfg + killall clixon_restconf fi # Restconf is enabled and restconf was running but was killed by stop ^.