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.
2016-01-22 13:33:33 -08:00
parent 5365831de8
commit 04897513cd
1 changed files with 1 additions and 1 deletions
@@ -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':