openstack
/
barbican
Code Issues Proposed changes

Merge "Switch from unittest2 compat methods to Python 3.x methods"

This commit is contained in:
Zuul 2020-07-28 17:48:03 +00:00 committed by Gerrit Code Review
parent ee8df1b4dc 03665ece43
commit 3bff3f77ee
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
barbican/tests/model/repositories/test_repositories_quotas.py
View File

@ -100,21 +100,21 @@ class WhenTestingProjectQuotasRepo(database_utils.RepositoryTestCase):
self.assertEqual(0, offset) self.assertEqual(0, offset)
self.assertEqual(10, limit) self.assertEqual(10, limit)
self.assertEqual(2, total) self.assertEqual(2, total)
self.assertItemsEqual([self.project_1.id, self.project_2.id], self.assertCountEqual([self.project_1.id, self.project_2.id],
[s.project_id for s in retrieved_project_quotas]) [s.project_id for s in retrieved_project_quotas])
self.assertItemsEqual([self.project_1.external_id, self.assertCountEqual([self.project_1.external_id,
self.project_2.external_id], self.project_2.external_id],
[s.project.external_id for s [s.project.external_id for s
in retrieved_project_quotas]) in retrieved_project_quotas])
self.assertItemsEqual([101, 201], self.assertCountEqual([101, 201],
[s.secrets for s in retrieved_project_quotas]) [s.secrets for s in retrieved_project_quotas])
self.assertItemsEqual([102, 202], self.assertCountEqual([102, 202],
[s.orders for s in retrieved_project_quotas]) [s.orders for s in retrieved_project_quotas])
self.assertItemsEqual([103, 203], self.assertCountEqual([103, 203],
[s.containers for s in retrieved_project_quotas]) [s.containers for s in retrieved_project_quotas])
self.assertItemsEqual([105, 205], self.assertCountEqual([105, 205],
[s.consumers for s in retrieved_project_quotas]) [s.consumers for s in retrieved_project_quotas])
self.assertItemsEqual([106, 206], self.assertCountEqual([106, 206],
[s.cas for s in retrieved_project_quotas]) [s.cas for s in retrieved_project_quotas])
def test_should_raise_get_list_of_zero_project_quotas(self): def test_should_raise_get_list_of_zero_project_quotas(self):

14
barbican/tests/objects/test_ovo_project_quotas.py
View File

@ -97,21 +97,21 @@ class TestProjectQuotas(test_ovo_base.OVOTestCase):
self.assertEqual(0, offset) self.assertEqual(0, offset)
self.assertEqual(10, limit) self.assertEqual(10, limit)
self.assertEqual(2, total) self.assertEqual(2, total)
self.assertItemsEqual([self.project_id1, self.project_id2], self.assertCountEqual([self.project_id1, self.project_id2],
[s.project_id for s in retrieved_project_quotas]) [s.project_id for s in retrieved_project_quotas])
self.assertItemsEqual([self.external_id1, self.assertCountEqual([self.external_id1,
self.external_id2], self.external_id2],
[s.project.external_id for s [s.project.external_id for s
in retrieved_project_quotas]) in retrieved_project_quotas])
self.assertItemsEqual([101, 201], self.assertCountEqual([101, 201],
[s.secrets for s in retrieved_project_quotas]) [s.secrets for s in retrieved_project_quotas])
self.assertItemsEqual([102, 202], self.assertCountEqual([102, 202],
[s.orders for s in retrieved_project_quotas]) [s.orders for s in retrieved_project_quotas])
self.assertItemsEqual([103, 203], self.assertCountEqual([103, 203],
[s.containers for s in retrieved_project_quotas]) [s.containers for s in retrieved_project_quotas])
self.assertItemsEqual([105, 205], self.assertCountEqual([105, 205],
[s.consumers for s in retrieved_project_quotas]) [s.consumers for s in retrieved_project_quotas])
self.assertItemsEqual([106, 206], self.assertCountEqual([106, 206],
[s.cas for s in retrieved_project_quotas]) [s.cas for s in retrieved_project_quotas])
def test_ovo_should_raise_get_list_of_zero_project_quotas(self): def test_ovo_should_raise_get_list_of_zero_project_quotas(self):