testing: Move removal of charon.pid into posttest section
Fixes: a103f3a284 ("testing: Add options to only run pre- or posttest scripts of a scenario")
This commit is contained in:
+10
-11
@@ -879,6 +879,16 @@ else
|
||||
|
||||
$DIR/scripts/restore-defaults $testname
|
||||
|
||||
##########################################################################
|
||||
# remove any charon.pid files that still may exist
|
||||
#
|
||||
|
||||
for host in $IPSECHOSTS
|
||||
do
|
||||
eval HOSTLOGIN=root@\$ipv4_${host}
|
||||
ssh $SSHCONF $HOSTLOGIN 'if [ -f /var/run/charon.pid ]; then rm /var/run/charon.pid; echo " removed charon.pid on `hostname`"; fi'
|
||||
done
|
||||
|
||||
fi
|
||||
############################################################################
|
||||
|
||||
@@ -928,17 +938,6 @@ fi
|
||||
</tr>
|
||||
@EOF
|
||||
|
||||
|
||||
##########################################################################
|
||||
# remove any charon.pid files that still may exist
|
||||
#
|
||||
|
||||
for host in $IPSECHOSTS
|
||||
do
|
||||
eval HOSTLOGIN=root@\$ipv4_${host}
|
||||
ssh $SSHCONF $HOSTLOGIN 'if [ -f /var/run/charon.pid ]; then rm /var/run/charon.pid; echo " removed charon.pid on `hostname`"; fi'
|
||||
done
|
||||
|
||||
##########################################################################
|
||||
# exit if aborted or running only pre-/posttest scripts
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user