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 #37707 from Ch3LL/fix_timeout_azure

Browse source 
add timeout increase on azure tests
This commit is contained in:
Mike Place 2016-11-16 10:24:24 +13:00 • committed by GitHub
commit ac9a316b50
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/integration/cloud/providers/msazure.py
View file

@ -23,6 +23,8 @@ from salt.config import cloud_providers_config
# Import Third-Party Libs
from salt.ext.six.moves import range
TIMEOUT = 500
try:
import azure # pylint: disable=unused-import
HAS_AZURE = True
@ -143,11 +145,12 @@ class AzureTest(integration.ShellCase):
'-p {0} {1}'.format(
PROFILE_NAME,
INSTANCE_NAME
)
), timeout=TIMEOUT
)]
)
except AssertionError:
self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME))
self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME),
timeout=TIMEOUT)
raise
# delete the instance
@ -157,7 +160,7 @@ class AzureTest(integration.ShellCase):
[i.strip() for i in self.run_cloud(
'-d {0} --assume-yes'.format(
INSTANCE_NAME
)
), timeout=TIMEOUT
)]
)
except AssertionError:
@ -172,7 +175,8 @@ class AzureTest(integration.ShellCase):
# if test instance is still present, delete it
if ret_str in query:
self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME))
self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME),
timeout=TIMEOUT)
if __name__ == '__main__':