| Message ID | 1462410066-41547-5-git-send-email-joe@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
Acked-by: Jarno Rajahalme <jarno@ovn.org> > On May 4, 2016, at 6:01 PM, Joe Stringer <joe@ovn.org> wrote: > > Some FTP tests had intermittent failures because the FTP daemons > might not load before the testsuite script iterated to running the > client. Add checks after launching FTP daemons to make these tests more > resilient. > > Signed-off-by: Joe Stringer <joe@ovn.org> > --- > tests/system-traffic.at | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/tests/system-traffic.at b/tests/system-traffic.at > index 9a1769fdb1af..eeeb3a15ec21 100644 > --- a/tests/system-traffic.at > +++ b/tests/system-traffic.at > @@ -1187,6 +1187,7 @@ AT_CHECK([ovs-ofctl --bundle replace-flows br0 flows1.txt]) > > NETNS_DAEMONIZE([at_ns0], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp1.pid]) > NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) > +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) > > dnl FTP requests from p1->p0 should fail due to network failure. > dnl Try 3 times, in 1 second intervals. > @@ -1271,6 +1272,7 @@ dnl "connect: Cannot assign requested address" > OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2 >/dev/null]) > > NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) > +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) > > dnl FTP requests from p0->p1 should work fine. > NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-proxy --no-remove-listing -o wget0.log -d]) > @@ -2133,6 +2135,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) > > dnl NETNS_DAEMONIZE([at_ns0], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp1.pid]) > NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) > +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) > > dnl FTP requests from p0->p1 should work fine. > NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 -4 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-proxy --no-remove-listing -o wget0.log -d]) > @@ -2200,6 +2203,7 @@ table=10 priority=0 action=drop > AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) > > NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) > +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) > > dnl FTP requests from p0->p1 should work fine. > NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 -4 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-proxy --no-remove-listing -o wget0.log -d]) > @@ -2299,6 +2303,7 @@ dnl "connect: Cannot assign requested address" > OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2 >/dev/null]) > > NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) > +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) > > dnl FTP requests from p0->p1 should work fine. > NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-proxy --no-remove-listing -o wget0.log -d]) > -- > 2.1.4 >
On 5 May 2016 at 13:05, Jarno Rajahalme <jarno@ovn.org> wrote:
> Acked-by: Jarno Rajahalme <jarno@ovn.org>
Thanks, applied.
diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 9a1769fdb1af..eeeb3a15ec21 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -1187,6 +1187,7 @@ AT_CHECK([ovs-ofctl --bundle replace-flows br0 flows1.txt]) NETNS_DAEMONIZE([at_ns0], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp1.pid]) NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) dnl FTP requests from p1->p0 should fail due to network failure. dnl Try 3 times, in 1 second intervals. @@ -1271,6 +1272,7 @@ dnl "connect: Cannot assign requested address" OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2 >/dev/null]) NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) dnl FTP requests from p0->p1 should work fine. NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-proxy --no-remove-listing -o wget0.log -d]) @@ -2133,6 +2135,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) dnl NETNS_DAEMONIZE([at_ns0], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp1.pid]) NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) dnl FTP requests from p0->p1 should work fine. NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 -4 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-proxy --no-remove-listing -o wget0.log -d]) @@ -2200,6 +2203,7 @@ table=10 priority=0 action=drop AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) dnl FTP requests from p0->p1 should work fine. NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 -4 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-proxy --no-remove-listing -o wget0.log -d]) @@ -2299,6 +2303,7 @@ dnl "connect: Cannot assign requested address" OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2 >/dev/null]) NETNS_DAEMONIZE([at_ns1], [[$PYTHON $srcdir/test-l7.py ftp]], [ftp0.pid]) +OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp]) dnl FTP requests from p0->p1 should work fine. NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-proxy --no-remove-listing -o wget0.log -d])
Some FTP tests had intermittent failures because the FTP daemons might not load before the testsuite script iterated to running the client. Add checks after launching FTP daemons to make these tests more resilient. Signed-off-by: Joe Stringer <joe@ovn.org> --- tests/system-traffic.at | 5 +++++ 1 file changed, 5 insertions(+)