Pass code check (14.04 LTS: pyflakes 0.8.1, pylint 1.1.0)
Was no longer passing due to pyflakes.
This commit is contained in:
@@ -93,6 +93,7 @@ LINKS = { 'default': Link, # Note: overridden below
|
|||||||
TESTS = { name: True
|
TESTS = { name: True
|
||||||
for name in ( 'pingall', 'pingpair', 'iperf', 'iperfudp' ) }
|
for name in ( 'pingall', 'pingpair', 'iperf', 'iperfudp' ) }
|
||||||
|
|
||||||
|
CLI = None # Set below if needed
|
||||||
|
|
||||||
# Locally defined tests
|
# Locally defined tests
|
||||||
def allTest( net ):
|
def allTest( net ):
|
||||||
@@ -309,7 +310,7 @@ class MininetRunner( object ):
|
|||||||
lg.setLogLevel( self.options.verbosity )
|
lg.setLogLevel( self.options.verbosity )
|
||||||
|
|
||||||
# Maybe we'll reorganize this someday...
|
# Maybe we'll reorganize this someday...
|
||||||
# pylint: disable=too-many-branches,too-many-statements
|
# pylint: disable=too-many-branches,too-many-statements,global-statement
|
||||||
|
|
||||||
def begin( self ):
|
def begin( self ):
|
||||||
"Create and run mininet."
|
"Create and run mininet."
|
||||||
@@ -388,7 +389,7 @@ class MininetRunner( object ):
|
|||||||
mn.addNAT( *opts.nat_args, **opts.nat_kwargs ).configDefault()
|
mn.addNAT( *opts.nat_args, **opts.nat_kwargs ).configDefault()
|
||||||
|
|
||||||
# --custom files can set CLI or change mininet.cli.CLI
|
# --custom files can set CLI or change mininet.cli.CLI
|
||||||
globals().setdefault( 'CLI', mininet.cli.CLI )
|
CLI = mininet.cli.CLI if CLI is None else CLI
|
||||||
|
|
||||||
if opts.pre:
|
if opts.pre:
|
||||||
CLI( mn, script=opts.pre )
|
CLI( mn, script=opts.pre )
|
||||||
|
|||||||
Reference in New Issue
Block a user