summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-07 14:01:23 +0000
committerGerrit Code Review <review@openstack.org>2020-07-07 14:01:23 +0000
commit904fd44ca34bea7d67c203b006443af95d4fa596 (patch)
tree83bb8c09e0b3308ca27026f4bc903adb67f64818
parentad2b85b4ed34add6afde47358ebd665a34c02c2a (diff)
parent441ac7c0bf74fef94678e91ae577894ca66693c8 (diff)
downloadpython-barbicanclient-904fd44ca34bea7d67c203b006443af95d4fa596.tar.gz
Merge "Switch from unittest2 compat methods to Python 3.x methods"
-rw-r--r--barbicanclient/tests/v1/test_containers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/barbicanclient/tests/v1/test_containers.py b/barbicanclient/tests/v1/test_containers.py
index 67eaa26..3cbdd92 100644
--- a/barbicanclient/tests/v1/test_containers.py
+++ b/barbicanclient/tests/v1/test_containers.py
@@ -200,7 +200,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
container_req = jsonutils.loads(self.responses.last_request.text)
self.assertEqual(self.container.name, container_req['name'])
self.assertEqual('certificate', container_req['type'])
- self.assertItemsEqual(self.container.certificate_secret_refs_json,
+ self.assertCountEqual(self.container.certificate_secret_refs_json,
container_req['secret_refs'])
def test_should_store_certificate_via_constructor(self):
@@ -225,7 +225,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
container_req = jsonutils.loads(self.responses.last_request.text)
self.assertEqual(self.container.name, container_req['name'])
self.assertEqual('certificate', container_req['type'])
- self.assertItemsEqual(self.container.certificate_secret_refs_json,
+ self.assertCountEqual(self.container.certificate_secret_refs_json,
container_req['secret_refs'])
def test_should_store_rsa_via_attributes(self):
@@ -249,7 +249,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
container_req = jsonutils.loads(self.responses.last_request.text)
self.assertEqual(self.container.name, container_req['name'])
self.assertEqual('rsa', container_req['type'])
- self.assertItemsEqual(self.container.rsa_secret_refs_json,
+ self.assertCountEqual(self.container.rsa_secret_refs_json,
container_req['secret_refs'])
def test_should_store_rsa_via_constructor(self):
@@ -274,7 +274,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
container_req = jsonutils.loads(self.responses.last_request.text)
self.assertEqual(self.container.name, container_req['name'])
self.assertEqual('rsa', container_req['type'])
- self.assertItemsEqual(self.container.rsa_secret_refs_json,
+ self.assertCountEqual(self.container.rsa_secret_refs_json,
container_req['secret_refs'])
def test_should_get_secret_refs_when_created_using_secret_objects(self):