[ovs-dev] [PATCH 2/2] tests: Sort output from dump-flows to avoid hash order dependency.

Ben Pfaff blp at nicira.com
Wed Feb 26 00:42:30 UTC 2014


Thanks, I applied both of these to master.

(I avoided making these mistakes in the backport, so no change is
necessary on branch-2.1.)

On Tue, Feb 25, 2014 at 04:39:52PM -0800, Joe Stringer wrote:
> Ah, I missed this. Looks good, thanks.
> 
> 
> On 25 February 2014 16:31, Ben Pfaff <blp at nicira.com> wrote:
> 
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> >  tests/ofproto-dpif.at |    8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
> > index b64ab41..97953d0 100644
> > --- a/tests/ofproto-dpif.at
> > +++ b/tests/ofproto-dpif.at
> > @@ -2793,9 +2793,9 @@ done
> >  ovs-appctl time/warp 1000
> >
> >  AT_CHECK([ovs-ofctl dump-flows br0], [0], [stdout])
> > -AT_CHECK([STRIP_XIDS stdout | sed -n
> > 's/duration=[[0-9]]*\.[[0-9]]*s/duration=0.0s/p'], [0], [dnl
> > - cookie=0x0, duration=0.0s, table=0, n_packets=10, n_bytes=600,
> > idle_age=1, ip actions=NORMAL
> > +AT_CHECK([STRIP_XIDS stdout | sed -n
> > 's/duration=[[0-9]]*\.[[0-9]]*s/duration=0.0s/p' | sort], [0], [dnl
> >   cookie=0x0, duration=0.0s, table=0, n_packets=0, n_bytes=0, idle_age=1,
> > icmp actions=NORMAL
> > + cookie=0x0, duration=0.0s, table=0, n_packets=10, n_bytes=600,
> > idle_age=1, ip actions=NORMAL
> >  ])
> >  OVS_VSWITCHD_STOP
> >  AT_CLEANUP
> > @@ -2816,9 +2816,9 @@ AT_CHECK([ovs-vsctl set Open_vSwitch .
> > other-config:n-revalidator-threads=2])
> >  ovs-appctl time/warp 1000
> >
> >  AT_CHECK([ovs-ofctl dump-flows br0], [0], [stdout])
> > -AT_CHECK([STRIP_XIDS stdout | sed -n
> > 's/duration=[[0-9]]*\.[[0-9]]*s/duration=0.0s/p'], [0], [dnl
> > - cookie=0x0, duration=0.0s, table=0, n_packets=10, n_bytes=600,
> > idle_age=1, ip actions=NORMAL
> > +AT_CHECK([STRIP_XIDS stdout | sed -n
> > 's/duration=[[0-9]]*\.[[0-9]]*s/duration=0.0s/p' | sort], [0], [dnl
> >   cookie=0x0, duration=0.0s, table=0, n_packets=0, n_bytes=0, idle_age=1,
> > icmp actions=NORMAL
> > + cookie=0x0, duration=0.0s, table=0, n_packets=10, n_bytes=600,
> > idle_age=1, ip actions=NORMAL
> >  ])
> >  OVS_VSWITCHD_STOP
> >  AT_CLEANUP
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
> >



More information about the dev mailing list