X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fofproto.at;h=0bc997cfec948b9db4fa9d7ee5309ed965d3c190;hb=27527aa09ce456796eeea728cef9528aa5612b70;hp=6602816ae6c87b424e5210b851362143ba167615;hpb=032f3fbd856864cdcbdf505d404e826999b8a2ae;p=sliver-openvswitch.git diff --git a/tests/ofproto.at b/tests/ofproto.at index 6602816ae..0bc997cfe 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -262,13 +262,13 @@ NXST_FLOW reply: ]) # Adding another flow will be refused. AT_CHECK([ovs-ofctl add-flow br0 in_port=5,actions=drop], [1], [], [stderr]) -AT_CHECK([head -n 1 stderr], [0], - [OFPT_ERROR (xid=0x1): OFPFMFC_ALL_TABLES_FULL +AT_CHECK([head -n 1 stderr | ofctl_strip], [0], + [OFPT_ERROR: OFPFMFC_ALL_TABLES_FULL ]) # Also a mod-flow that would add a flow will be refused. AT_CHECK([ovs-ofctl mod-flows br0 in_port=5,actions=drop], [1], [], [stderr]) -AT_CHECK([head -n 1 stderr], [0], - [OFPT_ERROR (xid=0x1): OFPFMFC_ALL_TABLES_FULL +AT_CHECK([head -n 1 stderr | ofctl_strip], [0], + [OFPT_ERROR: OFPFMFC_ALL_TABLES_FULL ]) # Replacing or modifying an existing flow is allowed. AT_CHECK([ovs-ofctl add-flow br0 in_port=4,actions=normal]) @@ -328,8 +328,8 @@ NXST_FLOW reply: # Flows with no timeouts at all cannot be evicted. AT_CHECK([ovs-ofctl add-flow br0 in_port=7,actions=normal]) AT_CHECK([ovs-ofctl add-flow br0 in_port=8,actions=drop], [1], [], [stderr]) -AT_CHECK([head -n 1 stderr], [0], - [OFPT_ERROR (xid=0x1): OFPFMFC_ALL_TABLES_FULL +AT_CHECK([head -n 1 stderr | ofctl_strip], [0], + [OFPT_ERROR: OFPFMFC_ALL_TABLES_FULL ]) AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl in_port=4 actions=NORMAL