diff options
| author | Ben Pfaff <blp@ovn.org> | 2016-05-26 16:57:00 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2016-06-03 13:18:25 -0700 |
| commit | 3a6e67fa5267eed92e351b8da2eb68d0ba71df41 (patch) | |
| tree | 124e5bd55dce79f458ef2e2145358d0ac1809ddd /tests | |
| parent | a28239c009bcb3389c036e4ebafe7c2dc3502c7f (diff) | |
| download | openvswitch-3a6e67fa5267eed92e351b8da2eb68d0ba71df41.tar.gz | |
tests: Fix select group test on big-endian systems.
This test ensures that, when the selection criteria for a select group are
the same from packet to packet, the same bucket is always selected.
However, it hardcoded the bucket that was selected to the one that happens
to be selected with the current OVS hash function on little-endian systems.
On big-endian systems, the current OVS hash functions turns out to select
the other bucket. That's fine (it's consistent, it just consistently makes
the other choice), so this commit fixes the problem by allowing either
bucket to be selected.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Aaron Conole <aconole@redhat.com>
Acked-by: Gerhard Stenzel <gstenzel@linux.vnet.ibm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ofproto-dpif.at | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index bf9cf8897..52d1c65dc 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -437,12 +437,12 @@ Datapath actions: 11 # Try a bunch of different flows and make sure that they are not distributed # as they only vary a field that is not hashed for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f; do - AT_CHECK([ovs-appctl ofproto/trace br0 "in_port=1,dl_src=50:54:00:00:00:$d,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0"], [0], [stdout]) + AT_CHECK([ovs-appctl ofproto/trace br0 "in_port=1,dl_src=50:54:00:00:00:0$d,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0"], [0], [stdout]) tail -1 stdout >> results done sort results | uniq -c -AT_CHECK([sort results | uniq], [0], - [Datapath actions: 10 +AT_CHECK([sort results | uniq | sed 's/1[[01]]/1?/'], [0], + [Datapath actions: 1? ]) OVS_VSWITCHD_STOP |