Skip to content
Snippets Groups Projects
Commit e3ab3fc2 authored by cody burkard's avatar cody burkard
Browse files

fix a few small issues with walkthrough tests

parent 098bede0
No related branches found
No related tags found
No related merge requests found
......@@ -9,6 +9,7 @@
import unittest
import pexpect
import os
import re
from mininet.util import quietRun
class testWalkthrough( unittest.TestCase ):
......@@ -25,7 +26,10 @@ def testHelp( self ):
def testWireshark( self ):
"Use tshark to test the of dissector"
tshark = pexpect.spawn( 'tshark -i lo -R of' )
tshark.expect( 'Capturing on lo' )
if ubuntuVersion() == '12.04':
tshark.expect( 'Capturing on lo' )
else:
tshark.expect( "Capturing on 'Loopback'" )
mn = pexpect.spawn( 'mn --test pingall' )
mn.expect( '0% dropped' )
tshark.expect( 'OFP 74 Hello' )
......@@ -101,11 +105,11 @@ def testHostCommands( self ):
break
self.assertEqual( ifcount, 3, 'Missing interfaces on s1')
# h1 ps
p.sendline( 'h1 ps -a' )
p.sendline( "h1 ps -a | egrep -v 'ps|grep'" )
p.expect( self.prompt )
h1Output = p.before
# s1 ps
p.sendline( 's1 ps -a' )
p.sendline( "s1 ps -a | egrep -v 'ps|grep'" )
p.expect( self.prompt )
s1Output = p.before
# strip command from ps output
......@@ -208,7 +212,7 @@ def testVerbosity( self ):
p = pexpect.spawn( 'mn -v debug --test none' )
p.expect( pexpect.EOF )
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 ):
"Start Mininet using a custom topo, then run pingall"
......@@ -327,5 +331,11 @@ def testRemoteController( self ):
pox.sendintr()
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__':
unittest.main()
\ No newline at end of file
unittest.main()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment