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

Merge pull request #54278 from Akm0d/cloud-test-logging

Browse source 
Correctly detect when an ms_azure instance is deleted
This commit is contained in:
Daniel Wozniak 2019-08-21 16:14:00 -07:00 • committed by GitHub
commit 93cf40a432
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,12 +93,11 @@ class CloudTest(ShellCase):
# Assert that the last query was successful
self.assertTrue(self._instance_exists(instance_name, query),
'Instance "{}" was not created successfully: '.format(', '.join(query)))
'Instance "{}" was not created successfully: {}'.format(self.instance_name, ', '.join(query)))
log.debug('Instance exists and was created: "{}"'.format(instance_name))
def assertDestroyInstance(self):
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)
if delete_str:
@ -122,7 +121,15 @@ class CloudTest(ShellCase):
self.assertEqual(current_state.get('name'), 'shutting-down')
return
# It's not clear from the delete string that deletion was successful, ask salt-cloud after a delay
sleep(shutdown_delay)
query = self.query_instances()
# some instances take a while to report their destruction
for tries in range(6):
if self._instance_exists(query=query):
sleep(30)
log.debug('Instance "{}" still found in query after {} tries: {}'
.format(self.instance_name, tries, query))
query = self.query_instances()
# The last query should have been successful
self.assertNotIn(self.instance_name, self.query_instances())
@property