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] - testing-cabal/testtools#286 [4] - testing-cabal/testtools#277 Change-Id: I1d77929d26af29e5d060eefdac85a5da2dd145d6
This commit is contained in:
parent
e712c255d0
commit
a3fcbb0966
|
@ -95,9 +95,9 @@ class TestCreateVnfPackage(TestVnfPackage):
|
||||||
json=json, headers=self.header)
|
json=json, headers=self.header)
|
||||||
|
|
||||||
columns, data = (self.create_vnf_package.take_action(parsed_args))
|
columns, data = (self.create_vnf_package.take_action(parsed_args))
|
||||||
self.assertItemsEqual(_get_columns_vnf_package(action='create'),
|
self.assertCountEqual(_get_columns_vnf_package(action='create'),
|
||||||
columns)
|
columns)
|
||||||
self.assertItemsEqual(vnf_package_fakes.get_vnf_package_data(json),
|
self.assertCountEqual(vnf_package_fakes.get_vnf_package_data(json),
|
||||||
data)
|
data)
|
||||||
|
|
||||||
|
|
||||||
|
@ -125,8 +125,8 @@ class TestListVnfPackage(TestVnfPackage):
|
||||||
expected_data.append(vnf_package_fakes.get_vnf_package_data(
|
expected_data.append(vnf_package_fakes.get_vnf_package_data(
|
||||||
vnf_package_obj, columns=columns, list_action=True))
|
vnf_package_obj, columns=columns, list_action=True))
|
||||||
|
|
||||||
self.assertItemsEqual(_get_columns_vnf_package(), actual_columns)
|
self.assertCountEqual(_get_columns_vnf_package(), actual_columns)
|
||||||
self.assertItemsEqual(expected_data, list(data))
|
self.assertCountEqual(expected_data, list(data))
|
||||||
|
|
||||||
|
|
||||||
@ddt.ddt
|
@ddt.ddt
|
||||||
|
@ -149,9 +149,9 @@ class TestShowVnfPackage(TestVnfPackage):
|
||||||
self.requests_mock.register_uri('GET', url, json=vnf_package_obj,
|
self.requests_mock.register_uri('GET', url, json=vnf_package_obj,
|
||||||
headers=self.header)
|
headers=self.header)
|
||||||
columns, data = (self.show_vnf_package.take_action(parsed_args))
|
columns, data = (self.show_vnf_package.take_action(parsed_args))
|
||||||
self.assertItemsEqual(_get_columns_vnf_package(
|
self.assertCountEqual(_get_columns_vnf_package(
|
||||||
vnf_package_obj=vnf_package_obj, action='show'), columns)
|
vnf_package_obj=vnf_package_obj, action='show'), columns)
|
||||||
self.assertItemsEqual(
|
self.assertCountEqual(
|
||||||
vnf_package_fakes.get_vnf_package_data(vnf_package_obj), data)
|
vnf_package_fakes.get_vnf_package_data(vnf_package_obj), data)
|
||||||
|
|
||||||
def test_show_no_options(self):
|
def test_show_no_options(self):
|
||||||
|
|
Loading…
Reference in New Issue