openstack
/
magnum
Code Issues Proposed changes

Remove six from unit tests (part 4) 

This is part of the steps to remove usage of six library, which is no
longer needed since python 2 support was removed.

Change-Id: I820f22d7a905f35122ae11f5bbf5b93a9e13a353
This commit is contained in:
Takashi Kajinami 2024-02-17 12:16:41 +09:00
parent 51e0a2205d
commit 3ec2b2b8a2
5 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magnum/tests/unit/db/test_cluster.py
View File

@ -15,7 +15,6 @@
"""Tests for manipulating Clusters via the DB API"""
from oslo_utils import uuidutils
import six
from magnum.common import context
from magnum.common import exception
@ -112,7 +111,7 @@ class DbClusterTestCase(base.DbTestCase):
uuids = []
for i in range(1, 6):
cluster = utils.create_test_cluster(uuid=uuidutils.generate_uuid())
uuids.append(six.text_type(cluster['uuid']))
uuids.append(str(cluster['uuid']))
res = self.dbapi.get_cluster_list(self.context)
res_uuids = [r.uuid for r in res]
self.assertEqual(sorted(uuids), sorted(res_uuids))
@ -121,7 +120,7 @@ class DbClusterTestCase(base.DbTestCase):
uuids = []
for _ in range(5):
cluster = utils.create_test_cluster(uuid=uuidutils.generate_uuid())
uuids.append(six.text_type(cluster.uuid))
uuids.append(str(cluster.uuid))
res = self.dbapi.get_cluster_list(self.context, sort_key='uuid')
res_uuids = [r.uuid for r in res]
self.assertEqual(sorted(uuids), res_uuids)
@ -214,7 +213,7 @@ class DbClusterTestCase(base.DbTestCase):
uuid=uuidutils.generate_uuid(),
project_id=uuidutils.generate_uuid(),
user_id=uuidutils.generate_uuid())
uuids.append(six.text_type(cluster['uuid']))
uuids.append(str(cluster['uuid']))
ctx = context.make_admin_context(all_tenants=True)
res = self.dbapi.get_cluster_list(ctx)
res_uuids = [r.uuid for r in res]

5
magnum/tests/unit/db/test_cluster_template.py
View File

@ -15,7 +15,6 @@
"""Tests for manipulating ClusterTemplate via the DB API"""
from oslo_utils import uuidutils
import six
from magnum.common import exception
from magnum.tests.unit.db import base
@ -32,7 +31,7 @@ class DbClusterTemplateTestCase(base.DbTestCase):
for i in range(1, 6):
ct = utils.create_test_cluster_template(
id=i, uuid=uuidutils.generate_uuid())
uuids.append(six.text_type(ct['uuid']))
uuids.append(str(ct['uuid']))
res = self.dbapi.get_cluster_template_list(self.context)
res_uuids = [r.uuid for r in res]
self.assertEqual(sorted(uuids), sorted(res_uuids))
@ -42,7 +41,7 @@ class DbClusterTemplateTestCase(base.DbTestCase):
for _ in range(5):
ct = utils.create_test_cluster_template(
uuid=uuidutils.generate_uuid())
uuids.append(six.text_type(ct['uuid']))
uuids.append(str(ct['uuid']))
res = self.dbapi.get_cluster_template_list(self.context,
sort_key='uuid')
res_uuids = [r.uuid for r in res]

7
magnum/tests/unit/db/test_federation.py
View File

@ -12,7 +12,6 @@
"""Tests for manipulating Federations via the DB API"""
from oslo_utils import uuidutils
import six
from magnum.common import context
from magnum.common import exception
@ -73,7 +72,7 @@ class DbFederationTestCase(base.DbTestCase):
for _ in range(5):
federation = utils.create_test_federation(
uuid=uuidutils.generate_uuid())
uuids.append(six.text_type(federation.uuid))
uuids.append(str(federation.uuid))
res = self.dbapi.get_federation_list(self.context, sort_key='uuid')
res_uuids = [r.uuid for r in res]
@ -84,7 +83,7 @@ class DbFederationTestCase(base.DbTestCase):
for _ in range(5):
federation = utils.create_test_federation(
uuid=uuidutils.generate_uuid())
uuids.append(six.text_type(federation.uuid))
uuids.append(str(federation.uuid))
res = self.dbapi.get_federation_list(self.context, sort_key='uuid')
res_uuids = [r.uuid for r in res]
@ -179,7 +178,7 @@ class DbFederationTestCase(base.DbTestCase):
federation = utils.create_test_federation(
uuid=uuidutils.generate_uuid(),
project_id=uuidutils.generate_uuid())
uuids.append(six.text_type(federation['uuid']))
uuids.append(str(federation['uuid']))
ctx = context.make_admin_context(all_tenants=True)
res = self.dbapi.get_federation_list(ctx)

5
magnum/tests/unit/db/test_x509keypair.py
View File

@ -16,7 +16,6 @@
"""Tests for manipulating X509KeyPairs via the DB API"""
from oslo_utils import uuidutils
import six
from magnum.common import context
from magnum.common import exception
@ -61,7 +60,7 @@ class DbX509KeyPairTestCase(base.DbTestCase):
for i in range(1, 6):
x509keypair = utils.create_test_x509keypair(
uuid=uuidutils.generate_uuid())
uuids.append(six.text_type(x509keypair['uuid']))
uuids.append(str(x509keypair['uuid']))
res = self.dbapi.get_x509keypair_list(self.context)
res_uuids = [r.uuid for r in res]
self.assertEqual(sorted(uuids), sorted(res_uuids))
@ -73,7 +72,7 @@ class DbX509KeyPairTestCase(base.DbTestCase):
uuid=uuidutils.generate_uuid(),
project_id=uuidutils.generate_uuid(),
user_id=uuidutils.generate_uuid())
uuids.append(six.text_type(x509keypair['uuid']))
uuids.append(str(x509keypair['uuid']))
ctx = context.make_admin_context(all_tenants=True)
res = self.dbapi.get_x509keypair_list(ctx)
res_uuids = [r.uuid for r in res]

5
magnum/tests/unit/objects/utils.py
View File

@ -20,7 +20,6 @@ import datetime
import iso8601
import netaddr
from oslo_utils import timeutils
import six
from magnum.common import exception
from magnum.i18n import _
@ -216,7 +215,7 @@ def datetime_or_none(dt):
def datetime_or_str_or_none(val):
if isinstance(val, six.string_types):
if isinstance(val, str):
return timeutils.parse_isotime(val)
return datetime_or_none(val)
@ -234,7 +233,7 @@ def str_or_none(val):
if val is None:
return val
else:
return six.text_type(val)
return str(val)
def ip_or_none(version):