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

fixed issue with AssertTrue and skip first test if using old OVS version

Browse Source
This commit is contained in:
Cody Burkard
2014-06-10 22:15:49 -07:00
parent de41192ea7
commit 29e5bee34e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/test/test_numberedports.py
+4 -3
View File
@@ -7,10 +7,11 @@ Test for numberedports.py
import unittest import unittest
import pexpect import pexpect
from collections import defaultdict from collections import defaultdict
from mininet.node import OVSSwitch
class testNumberedports( unittest.TestCase ): class testNumberedports( unittest.TestCase ):
@unittest.skipIf( OVSSwitch.setup() or OVSSwitch.isOldOVS(), "old version of OVS" )
def testConsistency( self ): def testConsistency( self ):
"""verify consistency between mininet and ovs ports""" """verify consistency between mininet and ovs ports"""
p = pexpect.spawn( 'python -m mininet.examples.numberedports' ) p = pexpect.spawn( 'python -m mininet.examples.numberedports' )
@@ -28,7 +29,7 @@ class testNumberedports( unittest.TestCase ):
elif index == 2: elif index == 2:
self.assertNotEqual( 0, count ) self.assertNotEqual( 0, count )
break break
self.assertTrue( correct_ports ) self.assertTrue( correct_ports )
def testNumbering( self ): def testNumbering( self ):
"""verify that all of the port numbers are printed correctly and consistent with their interface""" """verify that all of the port numbers are printed correctly and consistent with their interface"""
@@ -44,8 +45,8 @@ class testNumberedports( unittest.TestCase ):
ofport = p.match.group( 2 ) ofport = p.match.group( 2 )
self.assertEqual( intfport, ofport ) self.assertEqual( intfport, ofport )
elif index == 1: elif index == 1:
self.assertNotEqual( 0, count_intfs )
break break
self.assertNotEqual( 0, count_intfs )
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()