Merge "Fix a few Python 3.x issues"
diff --git a/tempest/api/object_storage/test_account_services.py b/tempest/api/object_storage/test_account_services.py
index eda4568..4209f1a 100644
--- a/tempest/api/object_storage/test_account_services.py
+++ b/tempest/api/object_storage/test_account_services.py
@@ -15,6 +15,7 @@
import random
+import six
import testtools
from tempest.api.object_storage import base
@@ -60,8 +61,10 @@
self.assertHeaders(resp, 'Account', 'GET')
self.assertIsNotNone(container_list)
+
for container_name in self.containers:
- self.assertIn(container_name, container_list)
+ self.assertIn(six.text_type(container_name).encode('utf-8'),
+ container_list)
@test.idempotent_id('884ec421-fbad-4fcc-916b-0580f2699565')
def test_list_no_containers(self):
@@ -246,7 +249,8 @@
params=params)
self.assertHeaders(resp, 'Account', 'GET')
for container in container_list:
- self.assertEqual(True, container.startswith(prefix))
+ self.assertEqual(True, container.decode(
+ 'utf-8').startswith(prefix))
@test.attr(type='smoke')
@test.idempotent_id('4894c312-6056-4587-8d6f-86ffbf861f80')
diff --git a/tempest/common/custom_matchers.py b/tempest/common/custom_matchers.py
index b6ff241..8410541 100644
--- a/tempest/common/custom_matchers.py
+++ b/tempest/common/custom_matchers.py
@@ -85,7 +85,7 @@
return NonExistentHeader('x-account-container-count')
if 'x-account-object-count' not in actual:
return NonExistentHeader('x-account-object-count')
- if actual['x-account-container-count'] > 0:
+ if int(actual['x-account-container-count']) > 0:
acct_header = "x-account-storage-policy-"
matched_policy_count = 0
diff --git a/tempest/common/preprov_creds.py b/tempest/common/preprov_creds.py
index 5e23696..3f68ae8 100644
--- a/tempest/common/preprov_creds.py
+++ b/tempest/common/preprov_creds.py
@@ -304,7 +304,9 @@
if exist_creds and not force_new:
return exist_creds
elif exist_creds and force_new:
- new_index = six.text_type(roles).encode('utf-8') + '-' + \
+ # NOTE(andreaf) In py3.x encode returns bytes, and b'' is bytes
+ # In py2.7 encode returns strings, and b'' is still string
+ new_index = six.text_type(roles).encode('utf-8') + b'-' + \
six.text_type(len(self._creds)).encode('utf-8')
self._creds[new_index] = exist_creds
net_creds = self._get_creds(roles=roles)