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.
This commit is contained in:
+1
-1
@@ -774,7 +774,7 @@ class Mininet( object ):
|
|||||||
while len( re.findall( '/sec', servout ) ) < count:
|
while len( re.findall( '/sec', servout ) ) < count:
|
||||||
servout += server.monitor( timeoutms=5000 )
|
servout += server.monitor( timeoutms=5000 )
|
||||||
server.sendInt()
|
server.sendInt()
|
||||||
server.waitOutput()
|
servout += server.waitOutput()
|
||||||
debug( 'Server output: %s\n' % servout )
|
debug( 'Server output: %s\n' % servout )
|
||||||
result = [ self._parseIperf( servout ), self._parseIperf( cliout ) ]
|
result = [ self._parseIperf( servout ), self._parseIperf( cliout ) ]
|
||||||
if l4Type == 'UDP':
|
if l4Type == 'UDP':
|
||||||
|
|||||||
Reference in New Issue
Block a user