From 1fe8df2bc854f3b1a586c7cd92462050aa5912f0 Mon Sep 17 00:00:00 2001
From: Joel Capitao <jcapitao@redhat.com>
Date: Wed, 3 Jun 2020 15:09:14 +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.
Credits to [5].

[1] - https://bugs.python.org/issue17866
[2] - https://hg.python.org/cpython/rev/d9921cb6e3cd
[3] - https://github.com/testing-cabal/testtools#286
[4] - https://github.com/testing-cabal/testtools#277
[5] - https://review.opendev.org/#/c/732393/

Change-Id: Ib1db7694a8f0f59d8762b02acbb4ef16e5176098
---
 .../tests/unit/extras/kerberos/test_fedkerb_loading.py          | 2 +-
 .../tests/unit/extras/kerberos/test_kerberos_loading.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py b/keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py
index 85e4c19..1705658 100644
--- a/keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py
+++ b/keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py
@@ -35,7 +35,7 @@ class FedKerbLoadingTests(test_utils.TestCase):
                         'mutual-auth',
                         ]

-        self.assertItemsEqual(allowed_opts, opts)
+        self.assertCountEqual(allowed_opts, opts)

     def create(self, **kwargs):
         loader = loading.get_plugin_loader('v3fedkerb')
diff --git a/keystoneauth1/tests/unit/extras/kerberos/test_kerberos_loading.py b/keystoneauth1/tests/unit/extras/kerberos/test_kerberos_loading.py
index ec87468..f228834 100644
--- a/keystoneauth1/tests/unit/extras/kerberos/test_kerberos_loading.py
+++ b/keystoneauth1/tests/unit/extras/kerberos/test_kerberos_loading.py
@@ -32,4 +32,4 @@ class KerberosLoadingTests(test_utils.TestCase):
                         'mutual-auth',
                         ]

-        self.assertItemsEqual(allowed_opts, opts)
+        self.assertCountEqual(allowed_opts, opts)
--
2.25.4