diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-06-29 15:25:06 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-06-29 15:25:06 -0600 |
| commit | e25472fad7c7494f6ee71d8fd79f1410b9406844 (patch) | |
| tree | 1f8c5aa93b7a94814832131c78d9d9ecb85dfd7f | |
| parent | a759ebf00044dd6031fbeed6f7d31099dbdfbba5 (diff) | |
Fixed tests to delete security groups.
Change-Id: I140618a310bae050bea29df665b98881c6052980
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
| -rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 733068f..83e34ca 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -156,28 +156,58 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): Cleans the created objects """ if self.inst_creator: - self.inst_creator.clean() + try: + self.inst_creator.clean() + except: + pass + + if self.sec_grp_creator: + try: + self.sec_grp_creator.clean() + except: + pass if self.keypair_creator: - self.keypair_creator.clean() + try: + self.keypair_creator.clean() + except: + pass if self.flavor_creator: - self.flavor_creator.clean() + try: + self.flavor_creator.clean() + except: + pass if os.path.isfile(self.keypair_pub_filepath): - os.remove(self.keypair_pub_filepath) + try: + os.remove(self.keypair_pub_filepath) + except: + pass if os.path.isfile(self.keypair_priv_filepath): - os.remove(self.keypair_priv_filepath) + try: + os.remove(self.keypair_priv_filepath) + except: + pass if self.router_creator: - self.router_creator.clean() + try: + self.router_creator.clean() + except: + pass if self.network_creator: - self.network_creator.clean() + try: + self.network_creator.clean() + except: + pass if self.image_creator and not self.image_creator.image_settings.exists: - self.image_creator.clean() + try: + self.image_creator.clean() + except: + pass if os.path.isfile(self.test_file_local_path): os.remove(self.test_file_local_path) |