diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-28 20:53:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-28 20:53:06 +0000 |
| commit | f008a7b0c1124a289ff0c36eb5a816f221a32b35 (patch) | |
| tree | 357b4016ae5a159025c283c5f73ffaa7c6633651 | |
| parent | 10209c5e5296ac0222bde4ddd0849a18e1c1155e (diff) | |
| parent | 22b3002fbc25d48ba2db3242d0898dff6c1a533e (diff) | |
| download | python-barbicanclient-f008a7b0c1124a289ff0c36eb5a816f221a32b35.tar.gz | |
Merge "Clean up all secrets in functional tests"
4 files changed, 9 insertions, 3 deletions
diff --git a/functionaltests/cli/v1/behaviors/container_behaviors.py b/functionaltests/cli/v1/behaviors/container_behaviors.py index 2368376..8e99520 100644 --- a/functionaltests/cli/v1/behaviors/container_behaviors.py +++ b/functionaltests/cli/v1/behaviors/container_behaviors.py @@ -90,5 +90,8 @@ class ContainerBehaviors(base_behaviors.BaseBehaviors): def delete_all_created_containers(self): """Delete all containers that we created""" - for href in self.container_hrefs_to_delete: + # Create a copy of the list -- otherwise delete_container will remove + # items from the list as we are iterating over it + containers_to_delete = list(self.container_hrefs_to_delete) + for href in containers_to_delete: self.delete_container(href) diff --git a/functionaltests/cli/v1/behaviors/secret_behaviors.py b/functionaltests/cli/v1/behaviors/secret_behaviors.py index 783db8b..1e970f1 100644 --- a/functionaltests/cli/v1/behaviors/secret_behaviors.py +++ b/functionaltests/cli/v1/behaviors/secret_behaviors.py @@ -141,5 +141,8 @@ class SecretBehaviors(base_behaviors.BaseBehaviors): def delete_all_created_secrets(self): """Delete all secrets that we created""" - for href in self.secret_hrefs_to_delete: + # Create a copy of the list -- otherwise delete_secret will remove + # items from the list as we are iterating over it + secrets_to_delete = list(self.secret_hrefs_to_delete) + for href in secrets_to_delete: self.delete_secret(href) diff --git a/functionaltests/cli/v1/smoke/test_acl.py b/functionaltests/cli/v1/smoke/test_acl.py index 0a194c5..a1ae6f8 100644 --- a/functionaltests/cli/v1/smoke/test_acl.py +++ b/functionaltests/cli/v1/smoke/test_acl.py @@ -136,7 +136,6 @@ class ACLTestCase(CmdLineTestCase): secret_ref = self.secret_behaviors.store_secret() container_ref = self.container_behaviors.create_container( secret_hrefs=[secret_ref]) - secret_ref = self.secret_behaviors.store_secret() data = self.acl_behaviors.acl_submit(entity_ref=container_ref, project_access=False, diff --git a/functionaltests/cli/v1/smoke/test_container.py b/functionaltests/cli/v1/smoke/test_container.py index 58395bf..f0244ee 100644 --- a/functionaltests/cli/v1/smoke/test_container.py +++ b/functionaltests/cli/v1/smoke/test_container.py @@ -28,6 +28,7 @@ class ContainerTestCase(CmdLineTestCase): def tearDown(self): super(ContainerTestCase, self).tearDown() + self.secret_behaviors.delete_all_created_secrets() self.container_behaviors.delete_all_created_containers() @testcase.attr('positive') |