From: Joe Stringer Date: Wed, 29 Aug 2012 03:09:37 +0000 (+1200) Subject: tests: Fix autopath tests X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad7c0437cffc1d9cf104f68c5c30284540caa11c;p=openvswitch tests: Fix autopath tests With the deprecation of autopath, some tests were broken. This patch fixes the test breakages. Signed-off-by: Joe Stringer Signed-off-by: Ben Pfaff --- diff --git a/tests/autopath.at b/tests/autopath.at index c3e0b346..634d46fc 100644 --- a/tests/autopath.at +++ b/tests/autopath.at @@ -5,11 +5,14 @@ AT_CHECK([ovs-ofctl parse-flow 'actions=autopath(1, NXM_NX_REG0[[]])'], [0], [usable protocols: any chosen protocol: OpenFlow10-table_id OFPT_FLOW_MOD (xid=0x1): ADD actions=autopath(1,NXM_NX_REG0[[]]) -]) +], [stderr]) AT_CHECK([ovs-ofctl parse-flow 'actions=autopath(2, NXM_NX_REG0[[2..30]])'], [0], [usable protocols: any chosen protocol: OpenFlow10-table_id OFPT_FLOW_MOD (xid=0x1): ADD actions=autopath(2,NXM_NX_REG0[[2..30]]) +], [stderr]) +AT_CHECK([[sed 's/^[^|]*|[^|]*|//' stderr]], [0], [dnl +autopath|WARN|The autopath action is deprecated and may be removed in February 2013. Please email dev@openvswitch.org with concerns. ]) AT_CLEANUP diff --git a/tests/ofp-actions.at b/tests/ofp-actions.at index 36c67f10..ba5003a9 100644 --- a/tests/ofp-actions.at +++ b/tests/ofp-actions.at @@ -73,6 +73,7 @@ ffff 0018 00002320 0009 000000000000 00000000885f3298 ffff 0020 00002320 000a 0000 0032 0000 0000 0000 0000 0000 0000 001f 00010004 # actions=autopath(2,NXM_NX_REG0[2..30]) +& autopath|WARN|The autopath action is deprecated and may be removed in February 2013. Please email dev@openvswitch.org with concerns. ffff 0018 00002320 000b 009c 00010004 00000002 00000000 # actions=bundle(eth_src,0,hrw,ofport,slaves:4,8) @@ -190,6 +191,7 @@ ffff 0018 00002320 0009 000000000000 00000000885f3298 ffff 0020 00002320 000a 0000 0032 0000 0000 0000 0000 0000 0000 001f 00010004 # actions=autopath(2,NXM_NX_REG0[2..30]) +& autopath|WARN|The autopath action is deprecated and may be removed in February 2013. Please email dev@openvswitch.org with concerns. ffff 0018 00002320 000b 009c 00010004 00000002 00000000 # actions=bundle(eth_src,0,hrw,ofport,slaves:4,8) diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index 2a298c5d..947f9852 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -187,7 +187,7 @@ actions=move:OXM_OF_ETH_DST[]->OXM_OF_ETH_SRC[] actions=autopath(5,NXM_NX_REG0[]) vlan_tci=0x1123/0x1fff,actions=drop ]]) -AT_CHECK([ovs-ofctl -F nxm -mmm parse-flows flows.txt], [0], [stdout]) +AT_CHECK([ovs-ofctl -F nxm -mmm parse-flows flows.txt], [0], [stdout], [stderr]) AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0], [[usable protocols: NXM chosen protocol: NXM-table_id @@ -216,6 +216,9 @@ NXT_FLOW_MOD: ADD actions=move:NXM_OF_ETH_DST[]->NXM_OF_ETH_SRC[] NXT_FLOW_MOD: ADD actions=autopath(5,NXM_NX_REG0[]) NXT_FLOW_MOD: ADD NXM_OF_VLAN_TCI_W(1123/1fff) actions=drop ]]) +AT_CHECK([[sed 's/^[^|]*|[^|]*|//' stderr]], [0], [dnl +autopath|WARN|The autopath action is deprecated and may be removed in February 2013. Please email dev@openvswitch.org with concerns. +]) AT_CLEANUP AT_SETUP([ovs-ofctl parse-nx-match])