Trying a different strategy for fixing py3 errors in testing

Change-Id: I54fed484ab2eb5ac54615b1b0ee131a0846d43fa
This commit is contained in:
Adam Harwell 2017-04-18 08:17:50 +09:00
parent 0da4437179
commit c54dd8fb2b
5 changed files with 11 additions and 11 deletions

View File

@ -207,7 +207,7 @@ class BaseTestCase(manager.NetworkScenarioTest):
def _create_servers(self): def _create_servers(self):
for count in range(2): 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: if count == 0:
self.servers['primary'] = self.server['id'] self.servers['primary'] = self.server['id']
else: else:
@ -249,11 +249,11 @@ class BaseTestCase(manager.NetworkScenarioTest):
'Content-Type: text/html; ' 'Content-Type: text/html; '
'charset=UTF-8\r\n\r\n%(server)s"; cat >/dev/null') '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], script.write(resp % {'s_id': server_name[-1],
'server': server_name}) 'server': server_name})
script.flush() script.flush()
with tempfile.NamedTemporaryFile() as key: with tempfile.NamedTemporaryFile(mode='w+') as key:
key.write(private_key) key.write(private_key)
key.flush() key.flush()
self.copy_file_to_host(script.name, self.copy_file_to_host(script.name,
@ -270,11 +270,11 @@ class BaseTestCase(manager.NetworkScenarioTest):
ssh_client.exec_command(cmd) ssh_client.exec_command(cmd)
if len(self.server_ips) == 1: if len(self.server_ips) == 1:
with tempfile.NamedTemporaryFile() as script: with tempfile.NamedTemporaryFile(mode='w+') as script:
script.write(resp % {'s_id': 2, script.write(resp % {'s_id': 2,
'server': 'server2'}) 'server': 'server2'})
script.flush() script.flush()
with tempfile.NamedTemporaryFile() as key: with tempfile.NamedTemporaryFile(mode='w+') as key:
key.write(private_key) key.write(private_key)
key.flush() key.flush()
self.copy_file_to_host(script.name, self.copy_file_to_host(script.name,
@ -527,7 +527,7 @@ class BaseTestCase(manager.NetworkScenarioTest):
for i in range(self.num): for i in range(self.num):
try: try:
server = urllib2.urlopen("http://{0}/".format(vip_ip), server = urllib2.urlopen("http://{0}/".format(vip_ip),
None, 2).read() None, 2).read().decode('utf8')
counters[server] += 1 counters[server] += 1
# HTTP exception means fail of server, so don't increase counter # HTTP exception means fail of server, so don't increase counter
# of success and continue connection tries # of success and continue connection tries
@ -615,7 +615,7 @@ class BaseTestCase(manager.NetworkScenarioTest):
"-i %(pkey)s %(file1)s %(dest)s" % {'pkey': pkey, "-i %(pkey)s %(file1)s %(dest)s" % {'pkey': pkey,
'file1': file_from, 'file1': file_from,
'dest': dest}) 'dest': dest})
args = shlex.split(cmd.encode('utf-8')) args = shlex.split(cmd)
subprocess_args = {'stdout': subprocess.PIPE, subprocess_args = {'stdout': subprocess.PIPE,
'stderr': subprocess.STDOUT} 'stderr': subprocess.STDOUT}
proc = subprocess.Popen(args, **subprocess_args) proc = subprocess.Popen(args, **subprocess_args)

View File

@ -38,7 +38,7 @@ class TestListenerBasic(base.BaseTestCase):
@test.services('compute', 'network') @test.services('compute', 'network')
def test_listener_basic(self): def test_listener_basic(self):
self._create_server(b'server1') self._create_server('server1')
self._start_servers() self._start_servers()
self._create_load_balancer() self._create_load_balancer()
self._check_load_balancing() self._check_load_balancing()

View File

@ -33,7 +33,7 @@ class TestLoadBalancerBasic(base.BaseTestCase):
5. Send NUM requests to the floating ip and check that they are shared 5. Send NUM requests to the floating ip and check that they are shared
between the two servers. between the two servers.
""" """
self._create_server(b'server1') self._create_server('server1')
self._start_servers() self._start_servers()
self._create_load_balancer() self._create_load_balancer()
self._check_load_balancing() self._check_load_balancing()

View File

@ -42,7 +42,7 @@ class TestSessionPersistence(base.BaseTestCase):
10. Turn session persistence off and check that the requests 10. Turn session persistence off and check that the requests
are again distributed according to the ROUND_ROBIN algorithm. are again distributed according to the ROUND_ROBIN algorithm.
""" """
self._create_server(b'server1') self._create_server('server1')
self._start_servers() self._start_servers()
self._create_load_balancer(persistence_type="SOURCE_IP") self._create_load_balancer(persistence_type="SOURCE_IP")
self._check_source_ip_persistence() self._check_source_ip_persistence()

View File

@ -38,7 +38,7 @@ class TestSharedPools(base.BaseTestCase):
""" """
second_listener_port = 8080 second_listener_port = 8080
self._create_server(b'server1') self._create_server('server1')
self._start_servers() self._start_servers()
# automatically creates first listener on port 80 # automatically creates first listener on port 80
self._create_load_balancer() self._create_load_balancer()