valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

better logging and fail messages

Browse Source
This commit is contained in:
Tyler Johnson 2019-08-07 15:53:37 -06:00
parent 9454f4cad9
commit 2f3942f8e5
No known key found for this signature in database
GPG Key ID: 691E31397E27D004
1 changed files with 8 additions and 5 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

@ -6,6 +6,7 @@ Tests for the Openstack Cloud Provider
# Import python libs
from __future__ import absolute_import, print_function, unicode_literals
import logging
from time import sleep
# Import Salt Testing libs
from tests.support.case import ShellCase
@ -28,17 +29,19 @@ class CloudTest(ShellCase):
return ' {0}:'.format(self.INSTANCE_NAME) in self.run_cloud('--query')
def _destroy_instance(self):
log.debug('Deleting instance "{}"'.format(self.INSTANCE_NAME))
delete = self.run_cloud('-d {0} --assume-yes'.format(self.INSTANCE_NAME), timeout=TIMEOUT)
# example response: ['gce-config:', '----------', ' gce:', '----------', 'cloud-test-dq4e6c:', 'True', '']
delete_str = ''.join(delete)
log.debug('Deletion status: {}'.format(delete_str))
print('e' * 100)
print(delete_str)
# TODO assert that 'shutting-down' will be in the delete_str?
if 'shutting-down' in delete_str:
print('Instance "{}" was deleted properly'.format(self.INSTANCE_NAME))
log.debug('Instance "{}" is shutting down'.format(self.INSTANCE_NAME))
sleep(180)
elif 'True' in delete_str:
log.debug('Instance "{}" was deleted successfully'.format(self.INSTANCE_NAME))
else:
print('Instance "{}" was not deleted'.format(self.INSTANCE_NAME))
log.error('Instance "{}" was not deleted properly'.format(self.INSTANCE_NAME))
self.assertEqual(self._instance_exists(), False)
def tearDown(self):