From: Ben Pfaff Date: Thu, 10 Apr 2014 17:04:56 +0000 (-0700) Subject: tests: Skip queue limit tests if the queues are very large. X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~148 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=21aa35c348e310aab7fa40038f69c5544a738066;hp=bee83872cab0c76877de0d8d93847a03ddb10503;p=sliver-openvswitch.git tests: Skip queue limit tests if the queues are very large. This should prevent timing out. Reported-by: Andrey Korolyov Signed-off-by: Ben Pfaff Acked-by: Alex Wang --- diff --git a/tests/ofproto.at b/tests/ofproto.at index 7838db751..dfa89151f 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -2154,6 +2154,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 7e9d9fd54..86179bdf9 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -687,6 +687,9 @@ fi n_iterations=`expr $rmem_max / 25000 + 5` echo rmem_max=$rmem_max n_iterations=$n_iterations +# If there's too much queuing skip the test to avoid timing out. +AT_SKIP_IF([test $rmem_max -gt 1048576]) + # Calculate the exact number of monitor updates expected for $n_iterations, # assuming no updates are combined. The "extra" update is for the initial # contents of the database.