diff --git a/tackerclient/tests/unit/osc/v1/test_vnf_package.py b/tackerclient/tests/unit/osc/v1/test_vnf_package.py index 2aff1e51..4d975f49 100644 --- a/tackerclient/tests/unit/osc/v1/test_vnf_package.py +++ b/tackerclient/tests/unit/osc/v1/test_vnf_package.py @@ -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) diff --git a/tackerclient/tests/unit/osc/v1/test_vnflcm.py b/tackerclient/tests/unit/osc/v1/test_vnflcm.py index 997c295e..e2836b76 100644 --- a/tackerclient/tests/unit/osc/v1/test_vnflcm.py +++ b/tackerclient/tests/unit/osc/v1/test_vnflcm.py @@ -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): diff --git a/tackerclient/tests/unit/osc/v1/vnf/test_vnf.py b/tackerclient/tests/unit/osc/v1/vnf/test_vnf.py index 7d8060da..eaf48973 100644 --- a/tackerclient/tests/unit/osc/v1/vnf/test_vnf.py +++ b/tackerclient/tests/unit/osc/v1/vnf/test_vnf.py @@ -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'