tests: supply --force where appropriate

This commit is contained in:
Ariadne Conill 2020-09-08 19:25:50 -06:00
parent 3b178131bd
commit 910985cd22

View file

@ -30,56 +30,56 @@ noargs_body() {
lo_always_auto_body() { lo_always_auto_body() {
atf_check -s exit:0 -e ignore -o match:'executors/link' \ atf_check -s exit:0 -e ignore -o match:'executors/link' \
ifdown -S/dev/null -E $EXECUTORS -i/dev/null -n -a ifdown -f -S/dev/null -E $EXECUTORS -i/dev/null -n -a
} }
dual_stack_body() { dual_stack_body() {
atf_check -s exit:0 -e ignore \ atf_check -s exit:0 -e ignore \
-o match:'executors/link' \ -o match:'executors/link' \
-o match:'executors/static' \ -o match:'executors/static' \
ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0.interfaces -n -a ifdown -f -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0.interfaces -n -a
} }
static_ipv4_body() { static_ipv4_body() {
atf_check -s exit:0 -e ignore \ atf_check -s exit:0 -e ignore \
-o match:'executors/link' \ -o match:'executors/link' \
-o match:'executors/static' \ -o match:'executors/static' \
ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v4.interfaces -n -a ifdown -f -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v4.interfaces -n -a
} }
static_ipv4_netmask_body() { static_ipv4_netmask_body() {
atf_check -s exit:0 -e ignore \ atf_check -s exit:0 -e ignore \
-o match:'executors/link' \ -o match:'executors/link' \
-o match:'executors/static' \ -o match:'executors/static' \
ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v4-netmask.interfaces -n -a ifdown -f -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v4-netmask.interfaces -n -a
} }
static_ipv6_body() { static_ipv6_body() {
atf_check -s exit:0 -e ignore \ atf_check -s exit:0 -e ignore \
-o match:'executors/link' \ -o match:'executors/link' \
-o match:'executors/static' \ -o match:'executors/static' \
ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v6.interfaces -n -a ifdown -f -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v6.interfaces -n -a
} }
static_ipv6_netmask_body() { static_ipv6_netmask_body() {
atf_check -s exit:0 -e ignore \ atf_check -s exit:0 -e ignore \
-o match:'executors/link' \ -o match:'executors/link' \
-o match:'executors/static' \ -o match:'executors/static' \
ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v6-netmask.interfaces -n -a ifdown -f -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v6-netmask.interfaces -n -a
} }
inet_dhcp_body() { inet_dhcp_body() {
atf_check -s exit:0 -e ignore \ atf_check -s exit:0 -e ignore \
-o match:'executors/link' \ -o match:'executors/link' \
-o match:'executors/dhcp' \ -o match:'executors/dhcp' \
ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/dhcp-eth0.interfaces -n -a ifdown -f -S/dev/null -E $EXECUTORS -i $FIXTURES/dhcp-eth0.interfaces -n -a
} }
use_dhcp_body() { use_dhcp_body() {
atf_check -s exit:0 -e ignore \ atf_check -s exit:0 -e ignore \
-o match:'executors/link' \ -o match:'executors/link' \
-o match:'executors/dhcp' \ -o match:'executors/dhcp' \
ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/use-dhcp-eth0.interfaces -n -a ifdown -f -S/dev/null -E $EXECUTORS -i $FIXTURES/use-dhcp-eth0.interfaces -n -a
} }
alias_eth0_home_body() { alias_eth0_home_body() {