lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a few small issues with walkthrough tests

Browse Source
This commit is contained in:
cody burkard
2014-10-02 11:10:17 -07:00
parent 098bede0ec
commit e3ab3fc239
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/test/test_walkthrough.py
+13 -3
View File
@@ -9,6 +9,7 @@ TODO: missing xterm test
import unittest import unittest
import pexpect import pexpect
import os import os
import re
from mininet.util import quietRun from mininet.util import quietRun
class testWalkthrough( unittest.TestCase ): class testWalkthrough( unittest.TestCase ):
@@ -25,7 +26,10 @@ class testWalkthrough( unittest.TestCase ):
def testWireshark( self ): def testWireshark( self ):
"Use tshark to test the of dissector" "Use tshark to test the of dissector"
tshark = pexpect.spawn( 'tshark -i lo -R of' ) tshark = pexpect.spawn( 'tshark -i lo -R of' )
if ubuntuVersion() == '12.04':
tshark.expect( 'Capturing on lo' ) tshark.expect( 'Capturing on lo' )
else:
tshark.expect( "Capturing on 'Loopback'" )
mn = pexpect.spawn( 'mn --test pingall' ) mn = pexpect.spawn( 'mn --test pingall' )
mn.expect( '0% dropped' ) mn.expect( '0% dropped' )
tshark.expect( 'OFP 74 Hello' ) tshark.expect( 'OFP 74 Hello' )
@@ -101,11 +105,11 @@ class testWalkthrough( unittest.TestCase ):
break break
self.assertEqual( ifcount, 3, 'Missing interfaces on s1') self.assertEqual( ifcount, 3, 'Missing interfaces on s1')
# h1 ps # h1 ps
p.sendline( 'h1 ps -a' ) p.sendline( "h1 ps -a | egrep -v 'ps|grep'" )
p.expect( self.prompt ) p.expect( self.prompt )
h1Output = p.before h1Output = p.before
# s1 ps # s1 ps
p.sendline( 's1 ps -a' ) p.sendline( "s1 ps -a | egrep -v 'ps|grep'" )
p.expect( self.prompt ) p.expect( self.prompt )
s1Output = p.before s1Output = p.before
# strip command from ps output # strip command from ps output
@@ -208,7 +212,7 @@ class testWalkthrough( unittest.TestCase ):
p = pexpect.spawn( 'mn -v debug --test none' ) p = pexpect.spawn( 'mn -v debug --test none' )
p.expect( pexpect.EOF ) p.expect( pexpect.EOF )
lines = p.before.split( '\n' ) lines = p.before.split( '\n' )
self.assertTrue( len( lines ) > 100, "Debug output is too short" ) self.assertTrue( len( lines ) > 70, "Debug output is too short" )
def testCustomTopo( self ): def testCustomTopo( self ):
"Start Mininet using a custom topo, then run pingall" "Start Mininet using a custom topo, then run pingall"
@@ -327,5 +331,11 @@ class testWalkthrough( unittest.TestCase ):
pox.sendintr() pox.sendintr()
pox.wait() pox.wait()
def ubuntuVersion():
releaseStr = quietRun( 'cat /etc/lsb-release' )
versionStr = re.findall( 'DISTRIB_RELEASE=\d+.\d+', releaseStr )[ 0 ]
version = versionStr.split( '=' )[ 1 ]
return version
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()