From: Jesse Gross <jesse@nicira.com>
Date: Thu, 27 Oct 2011 04:14:46 +0000 (-0700)
Subject: tests: Fix intermittent failure in ovs-monitor-ipsec test.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfbf7f354416264a0b84b09bf882ac0932e78c8b;p=openvswitch

tests: Fix intermittent failure in ovs-monitor-ipsec test.

The ovs-monitor-ipsec test waits for a specific number of lines
of output before doing a comparison to the correct values.  However,
some copy and pasted code did not update the number of lines to
look for resulting in a race condition where the comparison could
happen before the script finished running.
---

diff --git a/tests/ovs-monitor-ipsec.at b/tests/ovs-monitor-ipsec.at
index f9868e76..ab14462c 100644
--- a/tests/ovs-monitor-ipsec.at
+++ b/tests/ovs-monitor-ipsec.at
@@ -238,7 +238,7 @@ AT_CHECK([ovs_vsctl set-ssl /ssl-key.pem /ssl-cert.pem /ssl-cacert.pem \
 -----END CERTIFICATE-----
 "' \
                  options:use_ssl_cert='"true"'])
-OVS_WAIT_UNTIL([test `wc -l < actions` -ge 21])
+OVS_WAIT_UNTIL([test `wc -l < actions` -ge 33])
 AT_CHECK([sed '1,29d' actions], [0], [dnl
 racoon: reload
 setkey:
@@ -283,7 +283,7 @@ AT_CHECK([cat etc/racoon/certs/ovs-3.4.5.6.pem], [0], [dnl
 ### Delete the SSL certificate interface.
 ###
 AT_CHECK([ovs_vsctl del-port gre2])
-OVS_WAIT_UNTIL([test `wc -l < actions` -ge 29])
+OVS_WAIT_UNTIL([test `wc -l < actions` -ge 41])
 AT_CHECK([sed '1,33d' actions], [0], [dnl
 racoon: reload
 setkey: