From e7cfdac3f7bb53696c1b7d8cfaf11581396b85a0 Mon Sep 17 00:00:00 2001
From: Joel Capitao <jcapitao@redhat.com>
Date: Thu, 4 Jun 2020 18:13:18 +0200
Subject: [PATCH] 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: Ia857a7014e0dd8511923a7dc0edc113ff1164974
---
tackerclient/tests/unit/osc/v1/test_vnf_package.py | 4 ++--
tackerclient/tests/unit/osc/v1/test_vnflcm.py | 10 +++++-----
tackerclient/tests/unit/osc/v1/vnf/test_vnf.py | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tackerclient/tests/unit/osc/v1/test_vnf_package.py b/tackerclient/tests/unit/osc/v1/test_vnf_package.py
index be6e675..8bad7e1 100644
--- a/tackerclient/tests/unit/osc/v1/test_vnf_package.py
+++ b/tackerclient/tests/unit/osc/v1/test_vnf_package.py
@@ -534,9 +534,9 @@ 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.assertItemsEqual(
+ self.assertCountEqual(
vnf_package_fakes.get_vnf_package_data(fake_response), data)
def test_update_no_options(self):
diff --git a/tackerclient/tests/unit/osc/v1/test_vnflcm.py b/tackerclient/tests/unit/osc/v1/test_vnflcm.py
index 3a88f14..1e58c75 100644
--- a/tackerclient/tests/unit/osc/v1/test_vnflcm.py
+++ b/tackerclient/tests/unit/osc/v1/test_vnflcm.py
@@ -113,9 +113,9 @@ class TestCreateVnfLcm(TestVnfLcm):
if instantiate:
self.assertEqual(expected_message, buffer.getvalue().strip())
- self.assertItemsEqual(_get_columns_vnflcm(),
+ self.assertCountEqual(_get_columns_vnflcm(),
columns)
- self.assertItemsEqual(vnflcm_fakes.get_vnflcm_data(json),
+ self.assertCountEqual(vnflcm_fakes.get_vnflcm_data(json),
data)
@@ -143,7 +143,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)
@@ -171,9 +171,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 599b24b..babc374 100644
--- a/tackerclient/tests/unit/osc/v1/vnf/test_vnf.py
+++ b/tackerclient/tests/unit/osc/v1/vnf/test_vnf.py
@@ -85,14 +85,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'
--
2.25.4