From bad989053c066dbde968bb75405c4afdb4f8c52a Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Fri, 28 Apr 2017 14:42:00 -0700 Subject: [PATCH] test/ofproto: Improve test 'controller action without megaflows' Commit af7535e7dbeb9 expanded the test to check the output of meter stats, but without strip out the duration time. This makes the test sensitive to the speed of the machine that runs the test. Strip away the timing information to improve test reliability Fixes: af7535e7dbeb9 (ofproto: Meter slowpath action when action upcall meters are configured) Signed-off-by: Andy Zhou --- tests/ofproto-dpif.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 06c4e3bbf..e52ab32b9 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -1690,9 +1690,9 @@ vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,dl_type=0x4321 ]) dnl Check meter stats to make it gives the same picture; dnl 7 packets hit the meter, but 6 packets are dropped by band0. -AT_CHECK([ovs-ofctl -O OpenFlow13 meter-stats br0], [0], [dnl +AT_CHECK([ovs-ofctl -O OpenFlow13 meter-stats br0 | strip_timers], [0], [dnl OFPST_METER reply (OF1.3) (xid=0x2): -meter:controller flow_count:0 packet_in_count:7 byte_in_count:98 duration:1.054s bands: +meter:controller flow_count:0 packet_in_count:7 byte_in_count:98 duration:0.0s bands: 0: packet_count:6 byte_count:84 ]) -- 2.39.5