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

Update old utils paths to new utils paths

Browse source
This commit is contained in:
rallytime 2018-07-11 14:52:54 -04:00
parent 29b05ffdd1
commit d3190ca0c0
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/integration/runners/test_state.py
View file

@ -558,7 +558,7 @@ class OrchEventTest(ShellCase):
})
orch_sls = os.path.join(self.base_env, 'main.sls')
with salt.utils.fopen(orch_sls, 'w') as fp_:
with salt.utils.files.fopen(orch_sls, 'w') as fp_:
fp_.write(textwrap.dedent('''
include:
- one
@ -567,7 +567,7 @@ class OrchEventTest(ShellCase):
'''))
orch_sls = os.path.join(self.base_env, 'one.sls')
with salt.utils.fopen(orch_sls, 'w') as fp_:
with salt.utils.files.fopen(orch_sls, 'w') as fp_:
fp_.write(textwrap.dedent('''
{%- set foo = salt['saltutil.runner']('pillar.show_pillar') %}
placeholder_one:
@ -575,14 +575,14 @@ class OrchEventTest(ShellCase):
'''))
orch_sls = os.path.join(self.base_env, 'two.sls')
with salt.utils.fopen(orch_sls, 'w') as fp_:
with salt.utils.files.fopen(orch_sls, 'w') as fp_:
fp_.write(textwrap.dedent('''
placeholder_two:
test.succeed_without_changes
'''))
orch_sls = os.path.join(self.base_env, 'three.sls')
with salt.utils.fopen(orch_sls, 'w') as fp_:
with salt.utils.files.fopen(orch_sls, 'w') as fp_:
fp_.write(textwrap.dedent('''
placeholder_three:
test.succeed_without_changes

2
tests/integration/states/test_file.py
View file

@ -2322,7 +2322,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
user_check = self.run_function('file.get_user', [check])
mode_check = self.run_function('file.get_mode', [check])
assert user_check == user
assert salt.utils.normalize_mode(mode_check) == mode
assert salt.utils.files.normalize_mode(mode_check) == mode
def test_contents_pillar_with_pillar_list(self):
'''