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

removed py3-only function call

Browse source
This commit is contained in:
Tyler Johnson 2019-08-12 11:17:43 -06:00
parent 4406c579dd
commit e2f085ca59
No known key found for this signature in database
GPG key ID: 691E31397E27D004
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,9 +12,6 @@ from time import sleep
from tests.support.case import ShellCase
from tests.support.helpers import generate_random_name
# Import Salt Libs
from salt.ext.six import text_type
log = logging.getLogger(__name__)
TIMEOUT = 500
@ -39,7 +36,7 @@ class CloudTest(ShellCase):
'''
if creation_ret:
self.assertIn(self.instance_name, [i.strip(': ') for i in creation_ret])
self.assertNotIn('Failed to start', text_type(creation_ret))
self.assertNotIn('Failed to start', ''.join(creation_ret))
self.assertTrue(self._instance_exists(), 'Instance "{}" was not created successfully')
def _destroy_instance(self):
@ -70,7 +67,10 @@ class CloudTest(ShellCase):
def tearDown(self):
'''
Clean up after tests, If the instance still exists for any reason, delete it
Clean up after tests, If the instance still exists for any reason, delete it.
Instances should be destroyed before the tearDown, _destroy_instance() should be called exactly
one time in a test for each instance created. This is a failSafe and something went wrong
if the tearDown is where an instance is destroyed.
'''
instance_deleted = True
tries = 0