saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

run cloud --query if delete string is not available

Browse source
This commit is contained in:
Tyler Johnson 2019-08-20 19:50:23 -06:00
parent 33e6b6d6f5
commit 283f6314c3
No known key found for this signature in database
GPG key ID: 691E31397E27D004
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/integration/cloud/helpers/cloud_test_base.py
View file

@ -101,20 +101,20 @@ class CloudTest(ShellCase):
shutdown_delay = 30
log.debug('Deleting instance "{}"'.format(self.instance_name))
delete_str = self.run_cloud('-d {0} --assume-yes --out=yaml'.format(self.instance_name), timeout=TIMEOUT)
delete = safe_load('\n'.join(delete_str))
# example response: ['gce-config:', '----------', ' gce:', '----------', 'cloud-test-dq4e6c:', 'True', '']
self.assertIn(self.profile_str, delete)
self.assertIn(self.PROVIDER, delete[self.profile_str])
self.assertIn(self.instance_name, delete[self.profile_str][self.PROVIDER])
if delete_str:
delete = safe_load('\n'.join(delete_str))
# example response: ['gce-config:', '----------', ' gce:', '----------', 'cloud-test-dq4e6c:', 'True', '']
self.assertIn(self.profile_str, delete)
self.assertIn(self.PROVIDER, delete[self.profile_str])
self.assertIn(self.instance_name, delete[self.profile_str][self.PROVIDER])
delete_status = delete[self.profile_str][self.PROVIDER][self.instance_name]
if isinstance(delete_status, str):
self.assertEqual(delete_status, 'True')
elif isinstance(delete_status, dict):
if delete_status.get('currentState'):
self.assertEqual(delete_status.get('currentState').get('name'), 'shutting-down')
self.assertTrue(delete_status.get('ACTION', '').endswith('.delete'))
self.assertIn('.delete', delete_status.get('ACTION', ''))
else:
# It's not clear from the delete string that deletion was successful, ask salt-cloud after a delay
sleep(shutdown_delay)