From c54dd8fb2bb2753ae24e0d533a86f376e29778f7 Mon Sep 17 00:00:00 2001 From: Adam Harwell Date: Tue, 18 Apr 2017 08:17:50 +0900 Subject: [PATCH] Trying a different strategy for fixing py3 errors in testing Change-Id: I54fed484ab2eb5ac54615b1b0ee131a0846d43fa --- neutron_lbaas/tests/tempest/v2/scenario/base.py | 14 +++++++------- .../tempest/v2/scenario/test_listener_basic.py | 2 +- .../v2/scenario/test_load_balancer_basic.py | 2 +- .../v2/scenario/test_session_persistence.py | 2 +- .../tests/tempest/v2/scenario/test_shared_pools.py | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/neutron_lbaas/tests/tempest/v2/scenario/base.py b/neutron_lbaas/tests/tempest/v2/scenario/base.py index 91f58f63b..6d3dc32cb 100644 --- a/neutron_lbaas/tests/tempest/v2/scenario/base.py +++ b/neutron_lbaas/tests/tempest/v2/scenario/base.py @@ -207,7 +207,7 @@ class BaseTestCase(manager.NetworkScenarioTest): def _create_servers(self): for count in range(2): - self.server = self._create_server(name=(b"server%s" % (count + 1))) + self.server = self._create_server(name=("server%s" % (count + 1))) if count == 0: self.servers['primary'] = self.server['id'] else: @@ -249,11 +249,11 @@ class BaseTestCase(manager.NetworkScenarioTest): 'Content-Type: text/html; ' 'charset=UTF-8\r\n\r\n%(server)s"; cat >/dev/null') - with tempfile.NamedTemporaryFile() as script: + with tempfile.NamedTemporaryFile(mode='w+') as script: script.write(resp % {'s_id': server_name[-1], 'server': server_name}) script.flush() - with tempfile.NamedTemporaryFile() as key: + with tempfile.NamedTemporaryFile(mode='w+') as key: key.write(private_key) key.flush() self.copy_file_to_host(script.name, @@ -270,11 +270,11 @@ class BaseTestCase(manager.NetworkScenarioTest): ssh_client.exec_command(cmd) if len(self.server_ips) == 1: - with tempfile.NamedTemporaryFile() as script: + with tempfile.NamedTemporaryFile(mode='w+') as script: script.write(resp % {'s_id': 2, 'server': 'server2'}) script.flush() - with tempfile.NamedTemporaryFile() as key: + with tempfile.NamedTemporaryFile(mode='w+') as key: key.write(private_key) key.flush() self.copy_file_to_host(script.name, @@ -527,7 +527,7 @@ class BaseTestCase(manager.NetworkScenarioTest): for i in range(self.num): try: server = urllib2.urlopen("http://{0}/".format(vip_ip), - None, 2).read() + None, 2).read().decode('utf8') counters[server] += 1 # HTTP exception means fail of server, so don't increase counter # of success and continue connection tries @@ -615,7 +615,7 @@ class BaseTestCase(manager.NetworkScenarioTest): "-i %(pkey)s %(file1)s %(dest)s" % {'pkey': pkey, 'file1': file_from, 'dest': dest}) - args = shlex.split(cmd.encode('utf-8')) + args = shlex.split(cmd) subprocess_args = {'stdout': subprocess.PIPE, 'stderr': subprocess.STDOUT} proc = subprocess.Popen(args, **subprocess_args) diff --git a/neutron_lbaas/tests/tempest/v2/scenario/test_listener_basic.py b/neutron_lbaas/tests/tempest/v2/scenario/test_listener_basic.py index 64b21015d..e8dcbab54 100644 --- a/neutron_lbaas/tests/tempest/v2/scenario/test_listener_basic.py +++ b/neutron_lbaas/tests/tempest/v2/scenario/test_listener_basic.py @@ -38,7 +38,7 @@ class TestListenerBasic(base.BaseTestCase): @test.services('compute', 'network') def test_listener_basic(self): - self._create_server(b'server1') + self._create_server('server1') self._start_servers() self._create_load_balancer() self._check_load_balancing() diff --git a/neutron_lbaas/tests/tempest/v2/scenario/test_load_balancer_basic.py b/neutron_lbaas/tests/tempest/v2/scenario/test_load_balancer_basic.py index 34a77de55..fbbd7f062 100644 --- a/neutron_lbaas/tests/tempest/v2/scenario/test_load_balancer_basic.py +++ b/neutron_lbaas/tests/tempest/v2/scenario/test_load_balancer_basic.py @@ -33,7 +33,7 @@ class TestLoadBalancerBasic(base.BaseTestCase): 5. Send NUM requests to the floating ip and check that they are shared between the two servers. """ - self._create_server(b'server1') + self._create_server('server1') self._start_servers() self._create_load_balancer() self._check_load_balancing() diff --git a/neutron_lbaas/tests/tempest/v2/scenario/test_session_persistence.py b/neutron_lbaas/tests/tempest/v2/scenario/test_session_persistence.py index 81c4dfe9b..af3c28afa 100644 --- a/neutron_lbaas/tests/tempest/v2/scenario/test_session_persistence.py +++ b/neutron_lbaas/tests/tempest/v2/scenario/test_session_persistence.py @@ -42,7 +42,7 @@ class TestSessionPersistence(base.BaseTestCase): 10. Turn session persistence off and check that the requests are again distributed according to the ROUND_ROBIN algorithm. """ - self._create_server(b'server1') + self._create_server('server1') self._start_servers() self._create_load_balancer(persistence_type="SOURCE_IP") self._check_source_ip_persistence() diff --git a/neutron_lbaas/tests/tempest/v2/scenario/test_shared_pools.py b/neutron_lbaas/tests/tempest/v2/scenario/test_shared_pools.py index 663e62269..a0af25791 100644 --- a/neutron_lbaas/tests/tempest/v2/scenario/test_shared_pools.py +++ b/neutron_lbaas/tests/tempest/v2/scenario/test_shared_pools.py @@ -38,7 +38,7 @@ class TestSharedPools(base.BaseTestCase): """ second_listener_port = 8080 - self._create_server(b'server1') + self._create_server('server1') self._start_servers() # automatically creates first listener on port 80 self._create_load_balancer()