]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephfs: use assertCountEqual if PY3
authorKefu Chai <kchai@redhat.com>
Sun, 5 Apr 2020 12:50:11 +0000 (20:50 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 3 Jun 2020 11:56:59 +0000 (19:56 +0800)
assertItemsEqual is renamed to assertCountEqual in Python3.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 21d6c5a95b4a6873bc8f35a74e3f48436bd96264)

qa/tasks/cephfs/test_volume_client.py

index e31145397521d1fbfa157849dc9149ed2de259c3..189d080ec17d8ca98dc4355913ff5f3f7df99970 100644 (file)
@@ -688,10 +688,10 @@ vc.disconnect()
         # Check the list of authorized IDs and their access levels.
         if self.py_version == 'python3':
             expected_result = [('guest1', 'rw'), ('guest2', 'r')]
+            self.assertCountEqual(str(expected_result), auths)
         else:
             expected_result = [(u'guest1', u'rw'), (u'guest2', u'r')]
-
-        self.assertItemsEqual(str(expected_result), auths)
+            self.assertItemsEqual(str(expected_result), auths)
 
         # Disallow both the auth IDs' access to the volume.
         auths = self._volume_client_python(volumeclient_mount, dedent("""