From dfbf7f354416264a0b84b09bf882ac0932e78c8b Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Wed, 26 Oct 2011 21:14:46 -0700 Subject: [PATCH] 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. --- tests/ovs-monitor-ipsec.at | 4 ++-- 1 file 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: -- 2.20.1