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

fixed lint errors, more descriptive fails

Browse source
This commit is contained in:
Tyler Johnson 2019-08-12 10:47:08 -06:00
parent 6840d5f9e1
commit 4406c579dd
No known key found for this signature in database
GPG key ID: 691E31397E27D004
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/cloud/clouds/test_profitbricks.py
View file

@ -188,7 +188,7 @@ class ProfitBricksTest(CloudTest):
Test creating an instance on ProfitBricks
'''
# check if instance with salt installed returned
ret_str = self.run_cloud('-p profitbricks-test {0}'.format(self.instance_name),timeout=TIMEOUT)
ret_str = self.run_cloud('-p profitbricks-test {0}'.format(self.instance_name), timeout=TIMEOUT)
self.assertInstanceExists(ret_str)
self._destroy_instance()

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

@ -13,7 +13,7 @@ from tests.support.case import ShellCase
from tests.support.helpers import generate_random_name
# Import Salt Libs
from salt.ext import six
from salt.ext.six import text_type
log = logging.getLogger(__name__)
TIMEOUT = 500
@ -39,7 +39,7 @@ class CloudTest(ShellCase):
'''
if creation_ret:
self.assertIn(self.instance_name, [i.strip(': ') for i in creation_ret])
self.assertNotIn('Failed to start', six.text_type(creation_ret))
self.assertNotIn('Failed to start', text_type(creation_ret))
self.assertTrue(self._instance_exists(), 'Instance "{}" was not created successfully')
def _destroy_instance(self):
@ -64,7 +64,8 @@ class CloudTest(ShellCase):
log.warning('Instance "{}" may not have been deleted properly'.format(self.instance_name))
# By now it should all be over
self.assertFalse(self._instance_exists(), 'Could not destroy "{}"'.format(self.instance_name))
self.assertFalse(self._instance_exists(), 'Could not destroy "{}". Delete_str: {}'
.format(self.instance_name, delete_str))
log.debug('Instance "{}" no longer exists'.format(self.instance_name))
def tearDown(self):
@ -72,6 +73,7 @@ class CloudTest(ShellCase):
Clean up after tests, If the instance still exists for any reason, delete it
'''
instance_deleted = True
tries = 0
for tries in range(12):
if self._instance_exists():
instance_deleted = False
@ -87,5 +89,5 @@ class CloudTest(ShellCase):
.format(self.instance_name))
# Complain if the instance was destroyed in this tearDown.
# Destroying instances in the tearDown is a contingency, not the way things should work by default.
self.assertTrue(instance_deleted, 'The Instance "{}" was not deleted properly at the end of the test'
.format(self.instance_name))
self.assertTrue(instance_deleted, 'The Instance "{}" was deleted during the tearDown, not the test. Tries: {}'
.format(self.instance_name, tries))