From e4e2009e4c496b5ab735c300d00e3d6bd5f514eb Mon Sep 17 00:00:00 2001 From: Alin Gabriel Serdean Date: Tue, 21 Aug 2018 17:18:06 +0300 Subject: tunnel, tests: Sort flow output in ERSPAN v1/v2 metadata Sort the flows by input port in the test: tunnel.at:512: testing tunnel - ERSPAN v1/v2 metadata ... This tests fails on Windows due to the hash function sensitivity described in: https://mail.openvswitch.org/pipermail/ovs-dev/2018-August/350685.html Signed-off-by: Alin Gabriel Serdean Acked-by: Ben Pfaff Acked-by: William Tu --- tests/tunnel.at | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/tunnel.at b/tests/tunnel.at index 8040bb81e..e110a8292 100644 --- a/tests/tunnel.at +++ b/tests/tunnel.at @@ -592,9 +592,8 @@ dnl test wildcard mask: recevie all v2 regardless of its metadata AT_CHECK([ovs-ofctl del-flows br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=1,tun_erspan_hwid=0xf/0x1]) AT_CHECK([ovs-ofctl add-flow br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=0/0,tun_erspan_hwid=0x0/0x0,actions=2]) -AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], +AT_CHECK([ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip], [0], [dnl -NXST_FLOW reply: in_port=1 actions=output:3 in_port=2 actions=output:4 tun_erspan_ver=1,tun_erspan_idx=0x7,in_port=3 actions=output:1 -- cgit v1.2.1