The tests 'ovn-controller - I-P for address set update: multiple ASes used by same lflow' and 'dynamic-routing - EVPN default/custom naming - Dual Stack' check multiline outputs which can cause inconsistent results. The significant majority of the codebase sorts this for multi-line outputs to avoid flaky tests so it makes sense to also do so here.
Signed-off-by: MJ Ponsonby <[email protected]> --- tests/ovn-controller.at | 2 +- tests/system-ovn.at | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index 181a8afe0..c98de9bc4 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -1522,7 +1522,7 @@ for i in $(seq 10); do check ovn-nbctl --wait=hv sync if test "$i" = 9; then AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=$acl_eval,reg15=0x$port_key | \ - grep -v reply | awk '{print $7, $8}'], [0], [dnl + grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.6 actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,$acl_sample) priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.7 actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,$acl_sample) ]) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index c732af9b9..abe43e294 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -19309,9 +19309,9 @@ AT_CHECK([ovn-appctl evpn/vtep-multicast-group-list], [0], [dnl check bridge fdb append 00:00:00:00:00:00 dev $VXLAN_NAME dst 169.0.0.10 static permanent check bridge fdb append 00:00:00:00:00:00 dev $VXLAN_V6_NAME dst 169::10 static permanent -OVS_WAIT_FOR_OUTPUT_UNQUOTED([ovn-appctl evpn/remote-vtep-list], [0], [dnl -IP: 169::10, port: 4789, vni: $vni +OVS_WAIT_FOR_OUTPUT_UNQUOTED([ovn-appctl evpn/remote-vtep-list | sort], [0], [dnl IP: 169.0.0.10, port: 4789, vni: $vni +IP: 169::10, port: 4789, vni: $vni ]) OVS_WAIT_FOR_OUTPUT_UNQUOTED([ovn-appctl evpn/vtep-binding-list | cut -d',' -f2-], [0], [dnl -- 2.43.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
