First crack at Python 3 compatibility

Mostly we just use mininet.util.pexpect so that we can use
unicode strings without changing calls to pexpect.spawn()
This commit is contained in:
Bob Lantz
2018-07-25 19:44:45 -07:00
parent 6a387faa04
commit e37afe996b
25 changed files with 25 additions and 25 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ Tests for bind.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
class testBind( unittest.TestCase ): class testBind( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ A simple sanity check test for cluster edition
''' '''
import unittest import unittest
import pexpect from mininet.util import pexpect
class clusterSanityCheck( unittest.TestCase ): class clusterSanityCheck( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Tests for controllers.py and controllers2.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
class testControllers( unittest.TestCase ): class testControllers( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for controlnet.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
class testControlNet( unittest.TestCase ): class testControlNet( unittest.TestCase ):
+1 -1
View File
@@ -15,7 +15,7 @@ cfs 10% 1.29e+09
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
import sys import sys
class testCPU( unittest.TestCase ): class testCPU( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for emptynet.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
class testEmptyNet( unittest.TestCase ): class testEmptyNet( unittest.TestCase ):
+1 -1
View File
@@ -7,7 +7,7 @@ Test for hwintf.py
import unittest import unittest
import re import re
import pexpect from mininet.util import pexpect
from mininet.log import setLogLevel from mininet.log import setLogLevel
from mininet.node import Node from mininet.node import Node
+1 -1
View File
@@ -5,7 +5,7 @@ Test for intfOptions.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
import sys import sys
class testIntfOptions( unittest.TestCase ): class testIntfOptions( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for limit.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
import sys import sys
class testLimit( unittest.TestCase ): class testLimit( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for linearbandwidth.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
import sys import sys
class testLinearBandwidth( unittest.TestCase ): class testLinearBandwidth( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for linuxrouter.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
from mininet.util import quietRun from mininet.util import quietRun
class testLinuxRouter( unittest.TestCase ): class testLinuxRouter( unittest.TestCase ):
+1 -1
View File
@@ -6,7 +6,7 @@ validates mininet interfaces against systems interfaces
''' '''
import unittest import unittest
import pexpect from mininet.util import pexpect
class testMultiLink( unittest.TestCase ): class testMultiLink( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for multiping.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
from collections import defaultdict from collections import defaultdict
class testMultiPing( unittest.TestCase ): class testMultiPing( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for multipoll.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
class testMultiPoll( unittest.TestCase ): class testMultiPoll( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for multitest.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
class testMultiTest( unittest.TestCase ): class testMultiTest( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for nat.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
from mininet.util import quietRun from mininet.util import quietRun
destIP = '8.8.8.8' # Google DNS destIP = '8.8.8.8' # Google DNS
+1 -1
View File
@@ -5,7 +5,7 @@ Test for natnet.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
from mininet.util import quietRun from mininet.util import quietRun
class testNATNet( unittest.TestCase ): class testNATNet( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for numberedports.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
from collections import defaultdict from collections import defaultdict
from mininet.node import OVSSwitch from mininet.node import OVSSwitch
+1 -1
View File
@@ -5,7 +5,7 @@ Test for popen.py and popenpoll.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
class testPopen( unittest.TestCase ): class testPopen( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for scratchnet.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
class testScratchNet( unittest.TestCase ): class testScratchNet( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for simpleperf.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
import sys import sys
from mininet.log import setLogLevel from mininet.log import setLogLevel
+1 -1
View File
@@ -5,7 +5,7 @@ Test for sshd.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
from mininet.clean import sh from mininet.clean import sh
class testSSHD( unittest.TestCase ): class testSSHD( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for tree1024.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
import sys import sys
class testTree1024( unittest.TestCase ): class testTree1024( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for treeping64.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
import sys import sys
class testTreePing64( unittest.TestCase ): class testTreePing64( unittest.TestCase ):
+1 -1
View File
@@ -5,7 +5,7 @@ Test for vlanhost.py
""" """
import unittest import unittest
import pexpect from mininet.util import pexpect
import sys import sys
from mininet.util import quietRun from mininet.util import quietRun