openstack/osc-lib
Code Issues Proposed changes

Replace assertItemsEqual with assertCountEqual

Browse Source 
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: I631fb791ece68aac607aeae56ce96a0d472964c8
This commit is contained in:
Alfredo Moralejo
2020-03-13 11:38:50 +01:00
parent 53bf91951d
commit 32742e784a
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osc_lib/tests/cli/test_parseractions.py
View File

@@ -136,7 +136,7 @@ class TestMultiKeyValueAction(utils.TestCase):
{'req1': 'aaa', 'req2': 'bbb'}, {'req1': 'aaa', 'req2': 'bbb'},
{'req1': '', 'req2': ''}, {'req1': '', 'req2': ''},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
def test_empty_required_optional(self): def test_empty_required_optional(self):
self.parser.add_argument( self.parser.add_argument(
@@ -160,7 +160,7 @@ class TestMultiKeyValueAction(utils.TestCase):
{'req1': 'aaa', 'req2': 'bbb'}, {'req1': 'aaa', 'req2': 'bbb'},
{'req1': '', 'req2': ''}, {'req1': '', 'req2': ''},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
def test_error_values_with_comma(self): def test_error_values_with_comma(self):
data_list = [ data_list = [
@@ -254,7 +254,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [ expect = [
{'req1': 'aaa,bbb'}, {'req1': 'aaa,bbb'},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
results = self.parser.parse_args([ results = self.parser.parse_args([
'--test', 'req1=', '--test', 'req1=',
@@ -263,7 +263,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [ expect = [
{'req1': ''}, {'req1': ''},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
results = self.parser.parse_args([ results = self.parser.parse_args([
'--test', 'req1=aaa,bbb', '--test', 'req1=aaa,bbb',
@@ -274,7 +274,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
{'req1': 'aaa,bbb'}, {'req1': 'aaa,bbb'},
{'req1': ''}, {'req1': ''},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
def test_mkvca_optional(self): def test_mkvca_optional(self):
results = self.parser.parse_args([ results = self.parser.parse_args([
@@ -284,7 +284,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [ expect = [
{'req1': 'aaa,bbb'}, {'req1': 'aaa,bbb'},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
results = self.parser.parse_args([ results = self.parser.parse_args([
'--test', 'req1=aaa,bbb', '--test', 'req1=aaa,bbb',
@@ -295,7 +295,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
{'req1': 'aaa,bbb'}, {'req1': 'aaa,bbb'},
{'req1': '', 'opt2': 'ccc'}, {'req1': '', 'opt2': 'ccc'},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
try: try:
results = self.parser.parse_args([ results = self.parser.parse_args([
@@ -318,7 +318,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
'req1': 'aaa,bbb', 'req1': 'aaa,bbb',
'opt2': 'ccc', 'opt2': 'ccc',
}] }]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
def test_mkvca_no_required_optional(self): def test_mkvca_no_required_optional(self):
self.parser.add_argument( self.parser.add_argument(
@@ -339,7 +339,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [ expect = [
{'req1': 'aaa,bbb'}, {'req1': 'aaa,bbb'},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
results = self.parser.parse_args([ results = self.parser.parse_args([
'--test-empty', 'xyz=aaa,bbb', '--test-empty', 'xyz=aaa,bbb',
@@ -349,7 +349,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [ expect = [
{'xyz': 'aaa,bbb'}, {'xyz': 'aaa,bbb'},
] ]
self.assertItemsEqual(expect, actual) self.assertCountEqual(expect, actual)
def test_mkvca_invalid_key(self): def test_mkvca_invalid_key(self):
try: try:

20
osc_lib/tests/utils/test_tags.py
View File

@@ -37,19 +37,19 @@ class TestTags(test_utils.TestCase):
actual = getattr(parsed_args, 'tags', []) actual = getattr(parsed_args, 'tags', [])
expected = ['tag1', 'tag2'] expected = ['tag1', 'tag2']
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
actual = getattr(parsed_args, 'any_tags', []) actual = getattr(parsed_args, 'any_tags', [])
expected = ['tag4'] expected = ['tag4']
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
actual = getattr(parsed_args, 'not_tags', []) actual = getattr(parsed_args, 'not_tags', [])
expected = ['tag5'] expected = ['tag5']
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
actual = getattr(parsed_args, 'not_any_tags', []) actual = getattr(parsed_args, 'not_any_tags', [])
expected = ['tag6'] expected = ['tag6']
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
def test_get_tag_filtering_args(self): def test_get_tag_filtering_args(self):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@@ -76,12 +76,12 @@ class TestTags(test_utils.TestCase):
parsed_args = parser.parse_args(['--tag', 'tag1']) parsed_args = parser.parse_args(['--tag', 'tag1'])
actual = getattr(parsed_args, 'tags', []) actual = getattr(parsed_args, 'tags', [])
expected = ['tag1'] expected = ['tag1']
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
parsed_args = parser.parse_args(['--no-tag']) parsed_args = parser.parse_args(['--no-tag'])
actual = getattr(parsed_args, 'no-tag', []) actual = getattr(parsed_args, 'no-tag', [])
expected = [] expected = []
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
def test_add_tag_option_to_parser_for_set(self): def test_add_tag_option_to_parser_for_set(self):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@@ -90,12 +90,12 @@ class TestTags(test_utils.TestCase):
parsed_args = parser.parse_args(['--tag', 'tag1']) parsed_args = parser.parse_args(['--tag', 'tag1'])
actual = getattr(parsed_args, 'tags', []) actual = getattr(parsed_args, 'tags', [])
expected = ['tag1'] expected = ['tag1']
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
parsed_args = parser.parse_args(['--no-tag']) parsed_args = parser.parse_args(['--no-tag'])
actual = getattr(parsed_args, 'no-tag', []) actual = getattr(parsed_args, 'no-tag', [])
expected = [] expected = []
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
def test_add_tag_option_to_parser_for_unset(self): def test_add_tag_option_to_parser_for_unset(self):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@@ -108,12 +108,12 @@ class TestTags(test_utils.TestCase):
parsed_args = parser.parse_args(['--tag', 'tag1']) parsed_args = parser.parse_args(['--tag', 'tag1'])
actual = getattr(parsed_args, 'tags', []) actual = getattr(parsed_args, 'tags', [])
expected = ['tag1'] expected = ['tag1']
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
parsed_args = parser.parse_args(['--all-tag']) parsed_args = parser.parse_args(['--all-tag'])
actual = getattr(parsed_args, 'all-tag', []) actual = getattr(parsed_args, 'all-tag', [])
expected = [] expected = []
self.assertItemsEqual(expected, actual) self.assertCountEqual(expected, actual)
def test_update_tags_for_set(self): def test_update_tags_for_set(self):
mock_client = mock.MagicMock() mock_client = mock.MagicMock()