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

Switch open() for salt.utils.fopen()

Browse source
This commit is contained in:
Pedro Algarvio 2014-11-26 17:49:27 +00:00
parent 2a597da207
commit 753338e078
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
tests/integration/shell/call.py
View file

@ -22,6 +22,7 @@ ensure_in_syspath('../../')
# Import salt libs
import integration
import salt.utils
class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
@ -164,9 +165,10 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
start = datetime.now()
# Let's first test with a master running
open(minion_config_file, 'w').write(
yaml.dump(minion_config, default_flow_style=False)
)
with salt.utils.fopen(minion_config_file, 'w') as fh_:
fh_.write(
yaml.dump(minion_config, default_flow_style=False)
)
ret = self.run_script(
'salt-call',
'--config-dir {0} cmd.run "echo foo"'.format(
@ -193,9 +195,10 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
# Now let's remove the master configuration
minion_config.pop('master')
minion_config.pop('master_port')
open(minion_config_file, 'w').write(
yaml.dump(minion_config, default_flow_style=False)
)
with salt.utils.fopen(minion_config_file, 'w') as fh_:
fh_.write(
yaml.dump(minion_config, default_flow_style=False)
)
out = self.run_script(
'salt-call',
@ -240,9 +243,10 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
# Should work with local file client
minion_config['file_client'] = 'local'
open(minion_config_file, 'w').write(
yaml.dump(minion_config, default_flow_style=False)
)
with salt.utils.fopen(minion_config_file, 'w') as fh_:
fh_.write(
yaml.dump(minion_config, default_flow_style=False)
)
ret = self.run_script(
'salt-call',
'--config-dir {0} cmd.run "echo foo"'.format(
@ -267,13 +271,13 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
os.chdir(config_dir)
minion_config = yaml.load(
open(self.get_config_file_path('minion'), 'r').read()
)
with salt.utils.fopen(self.get_config_file_path('minion'), 'r') as fh_:
minion_config = yaml.load(fh_.read())
minion_config['log_file'] = 'file:///dev/log/LOG_LOCAL3'
open(os.path.join(config_dir, 'minion'), 'w').write(
yaml.dump(minion_config, default_flow_style=False)
)
with salt.utils.fopen(os.path.join(config_dir, 'minion'), 'w') as fh_:
fh_.write(
yaml.dump(minion_config, default_flow_style=False)
)
ret = self.run_script(
'salt-call',
'--config-dir {0} cmd.run "echo foo"'.format(