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 #47807 from dwoz/winrmtests

Browse source 
Try an even bigger timeout
This commit is contained in:
Nicole Thomas 2018-05-23 15:38:20 -04:00 • committed by GitHub
commit e65dece202
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/cloud/providers/test_ec2.py
View file

@ -39,7 +39,7 @@ def __random_name(size=6):
INSTANCE_NAME = __random_name()
PROVIDER_NAME = 'ec2'
HAS_WINRM = salt.utils.cloud.HAS_WINRM and salt.utils.cloud.HAS_SMB
TIMEOUT = 1000
TIMEOUT = 1200
class EC2Test(ShellCase):

6
tests/integration/files/conf/cloud.profiles.d/ec2.conf
View file

@ -1,12 +1,12 @@
ec2-test:
provider: ec2-config
image: ami-98aa1cf0
size: m1.small
size: m1.large
sh_username: ec2-user
script_args: '-P -Z'
ec2-win2012r2-test:
provider: ec2-config
size: m1.small
size: m1.large
image: ami-eb1ecd96
smb_port: 445
win_installer: ''
@ -19,7 +19,7 @@ ec2-win2012r2-test:
deploy: True
ec2-win2016-test:
provider: ec2-config
size: m1.small
size: m1.large
image: ami-ed14c790
smb_port: 445
win_installer: ''