[ovs-dev] [PATCH] tests: Skip queue limit tests if the queues are very large.

[Ben Pfaff]

Thanks, applied to master.

On Sun, Apr 06, 2014 at 04:58:31PM -0700, Alex Wang wrote:
> Acked-by: Alex Wang <alexw at nicira.com>
> 
> 
> 
> On Mon, Feb 10, 2014 at 12:08 PM, Ben Pfaff <blp at nicira.com> wrote:
> 
> > This should prevent timing out.
> >
> > Reported-by: Andrey Korolyov <andrey at xdel.ru>
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> >  tests/ofproto.at      |    3 +++
> >  tests/ovsdb-server.at |    3 +++
> >  2 files changed, 6 insertions(+)
> >
> > diff --git a/tests/ofproto.at b/tests/ofproto.at
> > index f6a62cd..58bbe82 100644
> > --- a/tests/ofproto.at
> > +++ b/tests/ofproto.at
> > @@ -2066,6 +2066,9 @@ fi
> >  queue_size=`expr $rmem_max + 128 \* 1024`
> >  echo rmem_max=$rmem_max queue_size=$queue_size
> >
> > +# If there's too much queuing skip the test to avoid timing out.
> > +AT_SKIP_IF([test $rmem_max -gt 1048576])
> > +
> >  # Each flow update message takes up at least 48 bytes of space in queues
> >  # and in practice more than that.
> >  n_msgs=`expr $queue_size / 48`
> > diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
> > index 0cc4375..256c669 100644
> > --- a/tests/ovsdb-server.at
> > +++ b/tests/ovsdb-server.at
> > @@ -688,6 +688,9 @@ fi
> >  queue_size=`expr $rmem_max + 1024 \* 1024`
> >  echo rmem_max=$rmem_max queue_size=$queue_size
> >
> > +# If there's too much queuing skip the test to avoid timing out.
> > +AT_SKIP_IF([test $rmem_max -gt 1048576])
> > +
> >  # Each flow update message takes up at least 48 bytes of space in queues
> >  # and in practice more than that.
> >  n_msgs=`expr $queue_size / 48`
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
> >