Blob Blame History Raw
From b026a064b1f0a52d09a6b743823a5621ddeb2804 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Mon, 1 Jun 2020 16:28:29 +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] - testing-cabal/testtools#286
[4] - testing-cabal/testtools#277
---
 openstackclient/tests/unit/common/test_parseractions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openstackclient/tests/unit/common/test_parseractions.py b/openstackclient/tests/unit/common/test_parseractions.py
index d015da4..736cd0b 100644
--- a/openstackclient/tests/unit/common/test_parseractions.py
+++ b/openstackclient/tests/unit/common/test_parseractions.py
@@ -92,7 +92,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(
@@ -116,7 +116,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):
         self.assertRaises(
-- 
2.20.1