diff --git a/tests/executors/link b/tests/executors/link new file mode 120000 index 0000000..1322f47 --- /dev/null +++ b/tests/executors/link @@ -0,0 +1 @@ +mock-executor \ No newline at end of file diff --git a/tests/ifdown_test b/tests/ifdown_test index 97fef50..0dcccf0 100755 --- a/tests/ifdown_test +++ b/tests/ifdown_test @@ -21,69 +21,62 @@ noargs_body() { } lo_always_auto_body() { - atf_check -s exit:0 -e ignore -o match:'ip link set down dev lo' \ - ifdown -S/dev/null -i/dev/null -n -a + atf_check -s exit:0 -e ignore -o match:'executors/link' \ + ifdown -S/dev/null -E $EXECUTORS -i/dev/null -n -a } dual_stack_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev lo' \ - -o match:'ip link set down dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0.interfaces -n -a } static_ipv4_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev lo' \ - -o match:'ip link set down dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v4.interfaces -n -a } static_ipv4_netmask_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev lo' \ - -o match:'ip link set down dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v4-netmask.interfaces -n -a } static_ipv6_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev lo' \ - -o match:'ip link set down dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v6.interfaces -n -a } static_ipv6_netmask_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev lo' \ - -o match:'ip link set down dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v6-netmask.interfaces -n -a } inet_dhcp_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev lo' \ - -o match:'ip link set down dev eth0' \ + -o match:'executors/link' \ -o match:'executors/dhcp' \ ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/dhcp-eth0.interfaces -n -a } use_dhcp_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev lo' \ - -o match:'ip link set down dev eth0' \ + -o match:'executors/link' \ -o match:'executors/dhcp' \ ifdown -S/dev/null -E $EXECUTORS -i $FIXTURES/use-dhcp-eth0.interfaces -n -a } alias_eth0_home_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev wlan0' \ + -o match:'executors/link' \ -o match:'executors/dhcp' \ ifdown -S $FIXTURES/alias-home.ifstate \ -E $EXECUTORS -i $FIXTURES/alias-home-work.interfaces -n wlan0 @@ -91,7 +84,7 @@ alias_eth0_home_body() { alias_eth0_work_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev wlan0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifdown -S $FIXTURES/alias-work.ifstate \ -E $EXECUTORS -i $FIXTURES/alias-home-work.interfaces -n wlan0 @@ -99,10 +92,7 @@ alias_eth0_work_body() { bonded_bridge_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set down dev eth0' \ - -o match:'ip link set down dev eth1' \ - -o match:'ip link set down dev bond0' \ - -o match:'ip link set down dev br0' \ + -o match:'executors/link' \ -o match:'executors/bond' \ -o match:'executors/bridge' \ -o match:'executors/static' \ diff --git a/tests/ifup_test b/tests/ifup_test index 788940c..cef02d5 100755 --- a/tests/ifup_test +++ b/tests/ifup_test @@ -21,86 +21,76 @@ noargs_body() { } lo_always_auto_body() { - atf_check -s exit:0 -e ignore -o match:'ip link set up dev lo' \ - ifup -S/dev/null -i/dev/null -n -a + atf_check -s exit:0 -e ignore -o match:'executors/link' \ + ifup -S/dev/null -E $EXECUTORS -i/dev/null -n -a } dual_stack_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev lo' \ - -o match:'ip link set up dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0.interfaces -n -a } static_ipv4_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev lo' \ - -o match:'ip link set up dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v4.interfaces -n -a } static_ipv4_netmask_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev lo' \ - -o match:'ip link set up dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v4-netmask.interfaces -n -a } static_ipv6_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev lo' \ - -o match:'ip link set up dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v6.interfaces -n -a } static_ipv6_netmask_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev lo' \ - -o match:'ip link set up dev eth0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/static-eth0-v6-netmask.interfaces -n -a } inet_dhcp_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev lo' \ - -o match:'ip link set up dev eth0' \ + -o match:'executors/link' \ -o match:'executors/dhcp' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/dhcp-eth0.interfaces -n -a } use_dhcp_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev lo' \ - -o match:'ip link set up dev eth0' \ + -o match:'executors/link' \ -o match:'executors/dhcp' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/use-dhcp-eth0.interfaces -n -a } alias_eth0_home_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev wlan0' \ + -o match:'executors/link' \ -o match:'executors/dhcp' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/alias-home-work.interfaces -n wlan0=home } alias_eth0_work_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev wlan0' \ + -o match:'executors/link' \ -o match:'executors/static' \ ifup -S/dev/null -E $EXECUTORS -i $FIXTURES/alias-home-work.interfaces -n wlan0=work } bonded_bridge_body() { atf_check -s exit:0 -e ignore \ - -o match:'ip link set up dev eth0' \ - -o match:'ip link set up dev eth1' \ - -o match:'ip link set up dev bond0' \ - -o match:'ip link set up dev br0' \ + -o match:'executors/link' \ -o match:'executors/bond' \ -o match:'executors/bridge' \ -o match:'executors/static' \