From 1471da95a94e4c5d04a5ea1530ebd8a76dfa6251 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Tue, 2 Dec 2014 22:57:32 -0800
Subject: [PATCH] Fix pylint errors
---
mininet/test/test_walkthrough.py | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/mininet/test/test_walkthrough.py b/mininet/test/test_walkthrough.py
index b7e7d7f4..f7f143a0 100755
--- a/mininet/test/test_walkthrough.py
+++ b/mininet/test/test_walkthrough.py
@@ -14,11 +14,13 @@
from distutils.version import StrictVersion
def tsharkVersion():
+ "Return tshark version"
versionStr = quietRun( 'tshark -v' )
- versionMatch = re.findall( 'TShark \d+.\d+.\d+', versionStr )[0]
+ versionMatch = re.findall( r'TShark \d+.\d+.\d+', versionStr )[0]
return versionMatch.split()[ 1 ]
class testWalkthrough( unittest.TestCase ):
+ "Test Mininet walkthrough"
prompt = 'mininet>'
@@ -31,6 +33,8 @@ def testHelp( self ):
def testWireshark( self ):
"Use tshark to test the of dissector"
+ # Satisfy pylint:
+ assert self
if StrictVersion( tsharkVersion() ) < StrictVersion( '1.12.0' ):
tshark = pexpect.spawn( 'tshark -i lo -R of' )
else:
@@ -51,7 +55,7 @@ def testBasic( self ):
self.assertEqual( index, 0, 'No output for "help" command')
# nodes command
p.sendline( 'nodes' )
- p.expect( '([chs]\d ?){4}' )
+ p.expect( r'([chs]\d ?){4}' )
nodes = p.match.group( 0 ).split()
self.assertEqual( len( nodes ), 4, 'No nodes in "nodes" command')
p.expect( self.prompt )
@@ -67,7 +71,7 @@ def testBasic( self ):
p.expect( self.prompt )
# dump command
p.sendline( 'dump' )
- expected = [ '<\w+ (%s)' % n for n in nodes ]
+ expected = [ r'<\w+ (%s)' % n for n in nodes ]
actual = []
for _ in nodes:
index = p.expect( expected )
@@ -161,7 +165,7 @@ def testRegressionRun( self ):
p.expect( pexpect.EOF )
# test iperf
p = pexpect.spawn( 'mn --test iperf' )
- p.expect( "Results: \['([\d\.]+) .bits/sec'," )
+ p.expect( r"Results: \['([\d\.]+) .bits/sec'," )
bw = float( p.match.group( 1 ) )
self.assertTrue( bw > 0 )
p.expect( pexpect.EOF )
@@ -170,7 +174,7 @@ def testTopoChange( self ):
"Test pingall on single,3 and linear,4 topos"
# testing single,3
p = pexpect.spawn( 'mn --test pingall --topo single,3' )
- p.expect( '(\d+)/(\d+) received')
+ p.expect( r'(\d+)/(\d+) received')
received = int( p.match.group( 1 ) )
sent = int( p.match.group( 2 ) )
self.assertEqual( sent, 6, 'Wrong number of pings sent in single,3' )
@@ -178,7 +182,7 @@ def testTopoChange( self ):
p.expect( pexpect.EOF )
# testing linear,4
p = pexpect.spawn( 'mn --test pingall --topo linear,4' )
- p.expect( '(\d+)/(\d+) received')
+ p.expect( r'(\d+)/(\d+) received')
received = int( p.match.group( 1 ) )
sent = int( p.match.group( 2 ) )
self.assertEqual( sent, 12, 'Wrong number of pings sent in linear,4' )
@@ -191,14 +195,14 @@ def testLinkChange( self ):
# test bw
p.expect( self.prompt )
p.sendline( 'iperf' )
- p.expect( "Results: \['([\d\.]+) Mbits/sec'," )
+ p.expect( r"Results: \['([\d\.]+) Mbits/sec'," )
bw = float( p.match.group( 1 ) )
self.assertTrue( bw < 10.1, 'Bandwidth > 10 Mb/s')
self.assertTrue( bw > 9.0, 'Bandwidth < 9 Mb/s')
p.expect( self.prompt )
# test delay
p.sendline( 'h1 ping -c 4 h2' )
- p.expect( 'rtt min/avg/max/mdev = ([\d\.]+)/([\d\.]+)/([\d\.]+)/([\d\.]+) ms' )
+ p.expect( r'rtt min/avg/max/mdev = ([\d\.]+)/([\d\.]+)/([\d\.]+)/([\d\.]+) ms' )
delay = float( p.match.group( 2 ) )
self.assertTrue( delay > 40, 'Delay < 40ms' )
self.assertTrue( delay < 45, 'Delay > 40ms' )
@@ -243,7 +247,7 @@ def testSwitches( self ):
switches = [ 'user', 'ovsk' ]
for sw in switches:
p = pexpect.spawn( 'mn --switch %s --test iperf' % sw )
- p.expect( "Results: \['([\d\.]+) .bits/sec'," )
+ p.expect( r"Results: \['([\d\.]+) .bits/sec'," )
bw = float( p.match.group( 1 ) )
self.assertTrue( bw > 0 )
p.expect( pexpect.EOF )
@@ -251,7 +255,7 @@ def testSwitches( self ):
def testBenchmark( self ):
"Run benchmark and verify that it takes less than 2 seconds"
p = pexpect.spawn( 'mn --test none' )
- p.expect( 'completed in ([\d\.]+) seconds' )
+ p.expect( r'completed in ([\d\.]+) seconds' )
time = float( p.match.group( 1 ) )
self.assertTrue( time < 2, 'Benchmark takes more than 2 seconds' )
@@ -275,7 +279,7 @@ def testOwnNamespace( self ):
self.assertEqual( ifcount, 2, 'Missing interfaces on s1' )
# verify that all hosts a reachable
p.sendline( 'pingall' )
- p.expect( '(\d+)% dropped' )
+ p.expect( r'(\d+)% dropped' )
dropped = int( p.match.group( 1 ) )
self.assertEqual( dropped, 0, 'pingall failed')
p.expect( self.prompt )
--
GitLab