diff options
author | Franza Cavalcante <franza.cavalcante@bestateless.com> | 2019-06-20 16:46:18 -0600 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@gmail.com> | 2019-06-22 19:53:11 +0900 |
commit | 8c90684b276d994d09b3dc0d5a030900bbb39929 (patch) | |
tree | 4fd885a311aaf800fcf7527ec06f9effd072fedb /test/scenario_test/route_server_as2_test.py | |
parent | 7c2f0967afba5e91e0ad1c76e9f71c4f578d5844 (diff) |
Python3 support to gobgp tests
This PR removes dependencies on old Fabric version, as it's not
supported by Python3.
The current Fabric versions don't support the colors and indent
used previously, so we found substitute methods from other
libraries and defined these in the library files.
The local function from fabric is now just a wrapper to invoke's
run function. All the files were processed through 2to3 command.
All the tests were executed and we don't see any difference on
the outputs when running Python2 or Python3.
The creation of gobgp container is removed from base.py into
fabfile.py, in order to comply with Fabric2 changes and simplify
dependencies.
Diffstat (limited to 'test/scenario_test/route_server_as2_test.py')
-rw-r--r-- | test/scenario_test/route_server_as2_test.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/scenario_test/route_server_as2_test.py b/test/scenario_test/route_server_as2_test.py index 75babb15..c5d62e58 100644 --- a/test/scenario_test/route_server_as2_test.py +++ b/test/scenario_test/route_server_as2_test.py @@ -13,13 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import + import unittest import sys import time -from fabric.api import local import nose from lib.noseplugin import OptionParser, parser_option @@ -28,6 +27,7 @@ from lib import base from lib.base import ( BGP_FSM_IDLE, BGP_FSM_ESTABLISHED, + local, ) from lib.gobgp import GoBGPContainer from lib.exabgp import ExaBGPContainer @@ -76,11 +76,11 @@ class GoBGPTestBase(unittest.TestCase): # test each neighbor state is turned establish def test_01_neighbor_established(self): - for q in self.quaggas.itervalues(): + for q in self.quaggas.values(): self.gobgp.wait_for(expected_state=BGP_FSM_ESTABLISHED, peer=q) def test_02_check_gobgp_local_rib(self): - for rs_client in self.quaggas.itervalues(): + for rs_client in self.quaggas.values(): done = False for _ in range(self.retry_limit): if done: @@ -111,7 +111,7 @@ class GoBGPTestBase(unittest.TestCase): if __name__ == '__main__': output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True) if int(output) is not 0: - print "docker not found" + print("docker not found") sys.exit(1) nose.main(argv=sys.argv, addplugins=[OptionParser()], |