On Mon, Nov 10, 2014 at 10:45:06AM -0800, Jarno Rajahalme wrote: > branch-2.0 seems to have one test failure due to the previous > backport (89b5ad6f "netflow: Fix interpretation of flow_seq.?).
Thanks for pointing that out. I pushed the following fix to branch-2.0: --8<--------------------------cut here-------------------------->8-- From: Ben Pfaff <[email protected]> Date: Mon, 10 Nov 2014 15:47:28 -0800 Subject: [PATCH] tests: Fix test failure in "ofproto-dpif - NetFlow flow expiration". Commit 89b5ad6f43b (netflow: Fix interpretation of flow_seq.) fixed a bug in the NetFlow code, which caused a failure in a test that depended on the broken behavior. This commit fixes up the test's expected output to match the new, correct output. Reported-by: Jarno Rajahalme <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> --- tests/ofproto-dpif.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index fa2025a..ff405c0 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -1869,10 +1869,10 @@ s/time [0-9]*\.\.\.[0-9]*/time <range>/ ' netflow.log | sort]], [0], [ header: v5, seq 0, engine 2,1 -header: v5, seq 1, engine 2,1 +header: v5, seq 2, engine 2,1 seq 0: 192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0, time <moment> -seq 1: 192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0, time <moment> -seq 1: 192.168.0.2 > 192.168.0.1, if 2 > 1, 2 pkts, 120 bytes, ICMP 0:0, time <range> +seq 2: 192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0, time <moment> +seq 2: 192.168.0.2 > 192.168.0.1, if 2 > 1, 2 pkts, 120 bytes, ICMP 0:0, time <range> ]) AT_CLEANUP -- 1.7.10.4 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
