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

Minor fixes to wireshark test

Browse Source
This commit is contained in:
Bob Lantz
2014-10-07 16:08:57 -07:00
parent e3ab3fc239
commit 61c144b9f6
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/test/test_walkthrough.py
+2 -10
View File
@@ -26,13 +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', "Capturing on 'Loopback'" ] )
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( [ '74 Hello', '74 of_hello' ] )
tshark.sendintr() tshark.sendintr()
def testBasic( self ): def testBasic( self ):
@@ -331,11 +328,6 @@ 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()