openstack
/
python-tackerclient
Code Issues Proposed changes

Replace assertItemsEqual with assertCountEqual 

assertItemsEqual was removed from Python's unittest.TestCase in
Python 3.3 [1][2]. We have been able to use them since then, because
testtools required unittest2, which still included it. With testtools
removing Python 2.7 support [3][4], we will lose support for
assertItemsEqual, so we should switch to use assertCountEqual.

[1] - https://bugs.python.org/issue17866
[2] - https://hg.python.org/cpython/rev/d9921cb6e3cd
[3] - https://github.com/testing-cabal/testtools/issues/286
[4] - https://github.com/testing-cabal/testtools/pull/277

Change-Id: I5a93a561981ad7ce88e5f3ce4032b1c48eb3ae70
This commit is contained in:
Joel Capitao 2020-06-04 16:08:13 +02:00
parent 1d033f9053
commit 3f504b1d4a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tackerclient/tests/unit/osc/v1/test_vnf_package.py
View File

@ -541,7 +541,7 @@ class TestUpdateVnfPackage(TestVnfPackage):
headers=self.header)
columns, data = self.update_vnf_package.take_action(parsed_args)
self.assertItemsEqual(_get_columns_vnf_package(
self.assertCountEqual(_get_columns_vnf_package(
vnf_package_obj=fake_response, action='update'), columns)
self.assertListItemsEqual(
vnf_package_fakes.get_vnf_package_data(fake_response), data)

8
tackerclient/tests/unit/osc/v1/test_vnflcm.py
View File

@ -115,7 +115,7 @@ class TestCreateVnfLcm(TestVnfLcm):
if instantiate:
self.assertEqual(expected_message, buffer.getvalue().strip())
self.assertItemsEqual(_get_columns_vnflcm(),
self.assertCountEqual(_get_columns_vnflcm(),
actual_columns)
self.assertListItemsEqual(vnflcm_fakes.get_vnflcm_data(
json, columns=attributes), data)
@ -145,7 +145,7 @@ class TestShowVnfLcm(TestVnfLcm):
json=vnf_instance, headers=self.header)
columns, data = (self.show_vnf_lcm.take_action(parsed_args))
self.assertItemsEqual(_get_columns_vnflcm(action='show'),
self.assertCountEqual(_get_columns_vnflcm(action='show'),
columns)
headers, attributes = vnflcm._get_columns(vnf_instance, action='show')
self.assertListItemsEqual(
@ -177,9 +177,9 @@ class TestListVnfLcm(TestVnfLcm):
expected_data.append(vnflcm_fakes.get_vnflcm_data(
vnf_instance_obj, columns=columns, list_action=True))
self.assertItemsEqual(_get_columns_vnflcm(action='list'),
self.assertCountEqual(_get_columns_vnflcm(action='list'),
actual_columns)
self.assertItemsEqual(expected_data, list(data))
self.assertCountEqual(expected_data, list(data))
class TestInstantiateVnfLcm(TestVnfLcm):

6
tackerclient/tests/unit/osc/v1/vnf/test_vnf.py
View File

@ -86,14 +86,14 @@ class TestUpdateVNF(TestVnfParameter):
json=json, headers=self.header)
columns, data = (self.set_vnf.take_action(parsed_args))
self.assertItemsEqual(_get_columns_vnf_parameter(),
self.assertCountEqual(_get_columns_vnf_parameter(),
columns)
self.assertEqual(get_client_called_count,
self.requests_mock.call_count)
self.assertItemsEqual(
self.assertCountEqual(
ast.literal_eval(self.requests_mock.last_request.body),
ast.literal_eval(body))
self.assertItemsEqual(self._get_vnf_data(json['vnf']), data)
self.assertCountEqual(self._get_vnf_data(json['vnf']), data)
def test_vnf_update_param_file(self):
my_id = 'my-id'