From 04897513cd7c62cda4d63f4e0d0fe3de7587b81c Mon Sep 17 00:00:00 2001 From: Bob Lantz Date: Fri, 22 Jan 2016 13:33:33 -0800 Subject: [PATCH] Collect all server output in iperf() This still isn't ideal - this was breaking UDP iperf, which can take a bit of time to print its output after you control-c it. --- mininet/net.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mininet/net.py b/mininet/net.py index 30d06ce..4d531c0 100755 --- a/mininet/net.py +++ b/mininet/net.py @@ -774,7 +774,7 @@ class Mininet( object ): while len( re.findall( '/sec', servout ) ) < count: servout += server.monitor( timeoutms=5000 ) server.sendInt() - server.waitOutput() + servout += server.waitOutput() debug( 'Server output: %s\n' % servout ) result = [ self._parseIperf( servout ), self._parseIperf( cliout ) ] if l4Type == 'UDP':