summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2011-10-26 21:14:46 -0700
committerJesse Gross <jesse@nicira.com>2011-10-26 21:18:40 -0700
commitdfbf7f354416264a0b84b09bf882ac0932e78c8b (patch)
treebdb157b640c4efb346c1b3ee917f645d27dd202f
parent1261619f8958b81df97bb45c1b27ca14aa43a3b4 (diff)
downloadopenvswitch-dfbf7f354416264a0b84b09bf882ac0932e78c8b.tar.gz
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.
-rw-r--r--tests/ovs-monitor-ipsec.at4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ovs-monitor-ipsec.at b/tests/ovs-monitor-ipsec.at
index f9868e768..ab14462c6 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: