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 #46879 from dwoz/cloudtestfix

Browse source 
Fix multiple typos causing tests to fail
This commit is contained in:
Mike Place 2018-04-05 08:59:28 -05:00 • committed by GitHub
commit 805ed1c964
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,10 +229,10 @@ class EC2Test(ShellCase):
# TODO: winexe calls hang and the test fails by timing out. The same
# same calls succeed when run outside of the test environment.
self.override_profile_config(
'ec2-win2012-test',
'ec2-win2012r2-test',
{
'use_winrm': False,
'user_data': self.copy_file('windows-firewall-winexe.ps1'),
'userdata_file': self.copy_file('windows-firewall-winexe.ps1'),
'win_installer': self.copy_file(self.INSTALLER),
},
)
@ -244,9 +244,9 @@ class EC2Test(ShellCase):
winrm (classic)
'''
self.override_profile_config(
'ec2-win2016-test',
'ec2-win2012r2-test',
{
'user_data': self.copy_file('windows-firewall.ps1'),
'userdata_file': self.copy_file('windows-firewall.ps1'),
'win_installer': self.copy_file(self.INSTALLER),
'winrm_ssl_verify': False,
}
@ -266,7 +266,7 @@ class EC2Test(ShellCase):
'ec2-win2016-test',
{
'use_winrm': False,
'user_data': self.copy_file('windows-firewall-winexe.ps1'),
'userdata_file': self.copy_file('windows-firewall-winexe.ps1'),
'win_installer': self.copy_file(self.INSTALLER),
},
)
@ -280,7 +280,7 @@ class EC2Test(ShellCase):
self.override_profile_config(
'ec2-win2016-test',
{
'user_data': self.copy_file('windows-firewall.ps1'),
'userdata_file': self.copy_file('windows-firewall.ps1'),
'win_installer': self.copy_file(self.INSTALLER),
'winrm_ssl_verify': False,
}