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

Fix config override name

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-03-29 13:41:06 -07:00
parent 5c22a0f88d
commit eabc234e5d
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,7 +132,7 @@ class EC2Test(ShellCase):
conf_path = os.path.join(self.get_config_dir(), 'cloud.profiles.d', 'ec2.conf')
with salt.utils.fopen(conf_path, 'r') as fp:
conf = yaml.safe_load(fp)
conf.update(data)
conf[name].update(data)
with salt.utils.fopen(conf_path, 'w') as fp:
yaml.dump(conf, fp)
@ -226,7 +226,7 @@ class EC2Test(ShellCase):
Tests creating and deleting a Windows 2012r2instance on EC2 using
winexe (classic)
'''
# TODO: winexe call's hang and the test fails by timing out. The same
# 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',
@ -260,7 +260,7 @@ class EC2Test(ShellCase):
Tests creating and deleting a Windows 2016 instance on EC2 using winrm
(classic)
'''
# TODO: winexe call's hang and the test fails by timing out. The same
# 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-win2016-test',