diff --git a/examples/test/test_bind.py b/examples/test/test_bind.py index dcc9fbf93..e423e39b0 100755 --- a/examples/test/test_bind.py +++ b/examples/test/test_bind.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect class testBind( unittest.TestCase ): diff --git a/examples/test/test_clusterSanity.py b/examples/test/test_clusterSanity.py index cdbc3906f..13e51e26b 100755 --- a/examples/test/test_clusterSanity.py +++ b/examples/test/test_clusterSanity.py @@ -5,7 +5,7 @@ ''' import unittest -import pexpect +from mininet.util import pexpect class clusterSanityCheck( unittest.TestCase ): diff --git a/examples/test/test_controllers.py b/examples/test/test_controllers.py index b9b93d9eb..abc79eb34 100755 --- a/examples/test/test_controllers.py +++ b/examples/test/test_controllers.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect class testControllers( unittest.TestCase ): diff --git a/examples/test/test_controlnet.py b/examples/test/test_controlnet.py index 3a99ea4c6..ba22740b5 100755 --- a/examples/test/test_controlnet.py +++ b/examples/test/test_controlnet.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect class testControlNet( unittest.TestCase ): diff --git a/examples/test/test_cpu.py b/examples/test/test_cpu.py index c7a626635..8b36c6eed 100755 --- a/examples/test/test_cpu.py +++ b/examples/test/test_cpu.py @@ -15,7 +15,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect import sys class testCPU( unittest.TestCase ): diff --git a/examples/test/test_emptynet.py b/examples/test/test_emptynet.py index f8e7c4a3c..aead61984 100755 --- a/examples/test/test_emptynet.py +++ b/examples/test/test_emptynet.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect class testEmptyNet( unittest.TestCase ): diff --git a/examples/test/test_hwintf.py b/examples/test/test_hwintf.py index 843fc409d..e242ca386 100755 --- a/examples/test/test_hwintf.py +++ b/examples/test/test_hwintf.py @@ -7,7 +7,7 @@ import unittest import re -import pexpect +from mininet.util import pexpect from mininet.log import setLogLevel from mininet.node import Node diff --git a/examples/test/test_intfoptions.py b/examples/test/test_intfoptions.py index 6f1ebecfa..2d724711e 100755 --- a/examples/test/test_intfoptions.py +++ b/examples/test/test_intfoptions.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect import sys class testIntfOptions( unittest.TestCase ): diff --git a/examples/test/test_limit.py b/examples/test/test_limit.py index 2052e7e0e..47ceaa1ec 100755 --- a/examples/test/test_limit.py +++ b/examples/test/test_limit.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect import sys class testLimit( unittest.TestCase ): diff --git a/examples/test/test_linearbandwidth.py b/examples/test/test_linearbandwidth.py index a18d97abf..9e876bc31 100755 --- a/examples/test/test_linearbandwidth.py +++ b/examples/test/test_linearbandwidth.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect import sys class testLinearBandwidth( unittest.TestCase ): diff --git a/examples/test/test_linuxrouter.py b/examples/test/test_linuxrouter.py index 60af20144..f9cf64854 100644 --- a/examples/test/test_linuxrouter.py +++ b/examples/test/test_linuxrouter.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect from mininet.util import quietRun class testLinuxRouter( unittest.TestCase ): diff --git a/examples/test/test_multilink.py b/examples/test/test_multilink.py index 4bea8b0a1..092554835 100755 --- a/examples/test/test_multilink.py +++ b/examples/test/test_multilink.py @@ -6,7 +6,7 @@ ''' import unittest -import pexpect +from mininet.util import pexpect class testMultiLink( unittest.TestCase ): diff --git a/examples/test/test_multiping.py b/examples/test/test_multiping.py index bb5440a1a..251912195 100755 --- a/examples/test/test_multiping.py +++ b/examples/test/test_multiping.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect from collections import defaultdict class testMultiPing( unittest.TestCase ): diff --git a/examples/test/test_multipoll.py b/examples/test/test_multipoll.py index 61e5cec4a..881503365 100755 --- a/examples/test/test_multipoll.py +++ b/examples/test/test_multipoll.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect class testMultiPoll( unittest.TestCase ): diff --git a/examples/test/test_multitest.py b/examples/test/test_multitest.py index 09172c5fa..4352b8e4d 100755 --- a/examples/test/test_multitest.py +++ b/examples/test/test_multitest.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect class testMultiTest( unittest.TestCase ): diff --git a/examples/test/test_nat.py b/examples/test/test_nat.py index c4bb096fb..865615f4a 100755 --- a/examples/test/test_nat.py +++ b/examples/test/test_nat.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect from mininet.util import quietRun destIP = '8.8.8.8' # Google DNS diff --git a/examples/test/test_natnet.py b/examples/test/test_natnet.py index 3addc92e2..4b9e099fb 100644 --- a/examples/test/test_natnet.py +++ b/examples/test/test_natnet.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect from mininet.util import quietRun class testNATNet( unittest.TestCase ): diff --git a/examples/test/test_numberedports.py b/examples/test/test_numberedports.py index 81ee1879d..ea7d61e48 100755 --- a/examples/test/test_numberedports.py +++ b/examples/test/test_numberedports.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect from collections import defaultdict from mininet.node import OVSSwitch diff --git a/examples/test/test_popen.py b/examples/test/test_popen.py index c7f83f01e..f41d53125 100755 --- a/examples/test/test_popen.py +++ b/examples/test/test_popen.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect class testPopen( unittest.TestCase ): diff --git a/examples/test/test_scratchnet.py b/examples/test/test_scratchnet.py index 43d8286f1..3d44955fb 100755 --- a/examples/test/test_scratchnet.py +++ b/examples/test/test_scratchnet.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect class testScratchNet( unittest.TestCase ): diff --git a/examples/test/test_simpleperf.py b/examples/test/test_simpleperf.py index 027c03935..93a36aa47 100755 --- a/examples/test/test_simpleperf.py +++ b/examples/test/test_simpleperf.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect import sys from mininet.log import setLogLevel diff --git a/examples/test/test_sshd.py b/examples/test/test_sshd.py index 6a39bba22..193b1eaf1 100755 --- a/examples/test/test_sshd.py +++ b/examples/test/test_sshd.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect from mininet.clean import sh class testSSHD( unittest.TestCase ): diff --git a/examples/test/test_tree1024.py b/examples/test/test_tree1024.py index e26af2ca7..06f8e4933 100755 --- a/examples/test/test_tree1024.py +++ b/examples/test/test_tree1024.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect import sys class testTree1024( unittest.TestCase ): diff --git a/examples/test/test_treeping64.py b/examples/test/test_treeping64.py index ae02afc50..8c346cd1a 100755 --- a/examples/test/test_treeping64.py +++ b/examples/test/test_treeping64.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect import sys class testTreePing64( unittest.TestCase ): diff --git a/examples/test/test_vlanhost.py b/examples/test/test_vlanhost.py index d68448f50..6781cced4 100644 --- a/examples/test/test_vlanhost.py +++ b/examples/test/test_vlanhost.py @@ -5,7 +5,7 @@ """ import unittest -import pexpect +from mininet.util import pexpect import sys from mininet.util import quietRun