From 6f91edd0ea3c57a314a143de8907eedc03b38d03 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Fri, 13 Mar 2020 11:29:47 +0100
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] - testing-cabal/testtools#286
[4] - testing-cabal/testtools#277
---
osc_lib/tests/cli/test_parseractions.py | 20 ++++++++++----------
osc_lib/tests/utils/test_tags.py | 20 ++++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/osc_lib/tests/cli/test_parseractions.py b/osc_lib/tests/cli/test_parseractions.py
index 5c62910..cb58027 100644
--- a/osc_lib/tests/cli/test_parseractions.py
+++ b/osc_lib/tests/cli/test_parseractions.py
@@ -89,7 +89,7 @@ class TestMultiKeyValueAction(utils.TestCase):
{'req1': 'aaa', 'req2': 'bbb'},
{'req1': '', 'req2': ''},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
def test_empty_required_optional(self):
self.parser.add_argument(
@@ -113,7 +113,7 @@ class TestMultiKeyValueAction(utils.TestCase):
{'req1': 'aaa', 'req2': 'bbb'},
{'req1': '', 'req2': ''},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
def test_error_values_with_comma(self):
data_list = [
@@ -207,7 +207,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [
{'req1': 'aaa,bbb'},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
results = self.parser.parse_args([
'--test', 'req1=',
@@ -216,7 +216,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [
{'req1': ''},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
results = self.parser.parse_args([
'--test', 'req1=aaa,bbb',
@@ -227,7 +227,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
{'req1': 'aaa,bbb'},
{'req1': ''},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
def test_mkvca_optional(self):
results = self.parser.parse_args([
@@ -237,7 +237,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [
{'req1': 'aaa,bbb'},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
results = self.parser.parse_args([
'--test', 'req1=aaa,bbb',
@@ -248,7 +248,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
{'req1': 'aaa,bbb'},
{'req1': '', 'opt2': 'ccc'},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
try:
results = self.parser.parse_args([
@@ -271,7 +271,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
'req1': 'aaa,bbb',
'opt2': 'ccc',
}]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
def test_mkvca_no_required_optional(self):
self.parser.add_argument(
@@ -292,7 +292,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [
{'req1': 'aaa,bbb'},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
results = self.parser.parse_args([
'--test-empty', 'xyz=aaa,bbb',
@@ -302,7 +302,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
expect = [
{'xyz': 'aaa,bbb'},
]
- self.assertItemsEqual(expect, actual)
+ self.assertCountEqual(expect, actual)
def test_mkvca_invalid_key(self):
try:
diff --git a/osc_lib/tests/utils/test_tags.py b/osc_lib/tests/utils/test_tags.py
index 9446b34..9a6a01a 100644
--- a/osc_lib/tests/utils/test_tags.py
+++ b/osc_lib/tests/utils/test_tags.py
@@ -32,19 +32,19 @@ class TestTags(test_utils.TestCase):
actual = getattr(parsed_args, 'tags', [])
expected = ['tag1', 'tag2']
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
actual = getattr(parsed_args, 'any_tags', [])
expected = ['tag4']
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
actual = getattr(parsed_args, 'not_tags', [])
expected = ['tag5']
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
actual = getattr(parsed_args, 'not_any_tags', [])
expected = ['tag6']
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
def test_get_tag_filtering_args(self):
parser = argparse.ArgumentParser()
@@ -71,12 +71,12 @@ class TestTags(test_utils.TestCase):
parsed_args = parser.parse_args(['--tag', 'tag1'])
actual = getattr(parsed_args, 'tags', [])
expected = ['tag1']
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
parsed_args = parser.parse_args(['--no-tag'])
actual = getattr(parsed_args, 'no-tag', [])
expected = []
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
def test_add_tag_option_to_parser_for_set(self):
parser = argparse.ArgumentParser()
@@ -85,12 +85,12 @@ class TestTags(test_utils.TestCase):
parsed_args = parser.parse_args(['--tag', 'tag1'])
actual = getattr(parsed_args, 'tags', [])
expected = ['tag1']
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
parsed_args = parser.parse_args(['--no-tag'])
actual = getattr(parsed_args, 'no-tag', [])
expected = []
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
def test_add_tag_option_to_parser_for_unset(self):
parser = argparse.ArgumentParser()
@@ -103,12 +103,12 @@ class TestTags(test_utils.TestCase):
parsed_args = parser.parse_args(['--tag', 'tag1'])
actual = getattr(parsed_args, 'tags', [])
expected = ['tag1']
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
parsed_args = parser.parse_args(['--all-tag'])
actual = getattr(parsed_args, 'all-tag', [])
expected = []
- self.assertItemsEqual(expected, actual)
+ self.assertCountEqual(expected, actual)
def test_update_tags_for_set(self):
mock_client = mock.MagicMock()
--
2.20.1