From e3ab3fc23921642d0479cfc0394e8ad14977edcc Mon Sep 17 00:00:00 2001
From: cody burkard <cody@onlab.us>
Date: Thu, 2 Oct 2014 09:53:26 -0700
Subject: [PATCH] fix a few small issues with walkthrough tests
---
mininet/test/test_walkthrough.py | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/mininet/test/test_walkthrough.py b/mininet/test/test_walkthrough.py
index 2c2d6b0d..6793252a 100755
--- a/mininet/test/test_walkthrough.py
+++ b/mininet/test/test_walkthrough.py
@@ -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()
--
GitLab