From cca3608ad7307ef45faaa095be6aef2b23929800 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Tue, 25 Aug 2020 08:16:05 -0600 Subject: [PATCH] link tests: switch back to up/down from pre-up/post-down --- tests/linux/link_test | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/linux/link_test b/tests/linux/link_test index 6a8ff24..1cb2784 100755 --- a/tests/linux/link_test +++ b/tests/linux/link_test @@ -15,51 +15,51 @@ tests_init \ vlan_guessed_depend up_body() { - export IFACE=lo PHASE=pre-up MOCK=echo + export IFACE=lo PHASE=up MOCK=echo atf_check -s exit:0 -o match:'ip link set up dev lo' \ ${EXECUTOR} } down_body() { - export IFACE=lo PHASE=post-down MOCK=echo + export IFACE=lo PHASE=down MOCK=echo atf_check -s exit:0 -o match:'ip link set down dev lo' \ ${EXECUTOR} } mtu_body() { - export IFACE=eth0 PHASE=pre-up MOCK=echo IF_MTU=1492 + export IFACE=eth0 PHASE=up MOCK=echo IF_MTU=1492 atf_check -s exit:0 -o match:'ip link set up dev eth0 mtu 1492' \ ${EXECUTOR} } vlan_explicit_up_body() { - export IFACE=servers PHASE=pre-up MOCK=echo \ + export IFACE=servers PHASE=up MOCK=echo \ IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123" atf_check -s exit:0 -o match:'ip link add link eth0 name servers type vlan id 123' \ ${EXECUTOR} } vlan_explicit_down_body() { - export IFACE=servers PHASE=post-down MOCK=echo \ + export IFACE=servers PHASE=down MOCK=echo \ IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123" atf_check -s exit:0 -o match:'ip link delete link eth0 name servers type vlan id 123' \ ${EXECUTOR} } vlan_guessed_up_body() { - export IFACE=eth0.8 PHASE=pre-up MOCK=echo + export IFACE=eth0.8 PHASE=up MOCK=echo atf_check -s exit:0 -o match:'ip link add link eth0 name eth0.8 type vlan id 8' \ ${EXECUTOR} } vlan_guessed_down_body() { - export IFACE=eth0.8 PHASE=post-down MOCK=echo + export IFACE=eth0.8 PHASE=down MOCK=echo atf_check -s exit:0 -o match:'ip link delete link eth0 name eth0.8 type vlan id 8' \ ${EXECUTOR} } vlan_explicit_depend_body() { - export IFACE=servers PHASE=pre-up MOCK=echo \ + export IFACE=servers PHASE=up MOCK=echo \ IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123" atf_check -s exit:0 -o match:'eth0' \ ${EXECUTOR}