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 #49589 from rallytime/utils-paths

Browse source 
Update old utils paths to use new utils paths
This commit is contained in:
Nicole Thomas 2018-09-10 12:51:30 -04:00 • committed by GitHub
commit 39f9c9c952
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2246,7 +2246,9 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
if salt.utils.platform.is_windows():
import subprocess
import win32api
p = subprocess.Popen(salt.utils.to_str('type {}'.format(win32api.GetShortPathName(test_file))),
p = subprocess.Popen(
salt.utils.stringutils.to_str(
'type {}'.format(win32api.GetShortPathName(test_file))),
shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
p.poll()
out = p.stdout.read()

7
tests/support/helpers.py
View file

@ -59,6 +59,7 @@ from tests.support.paths import FILES, TMP
# Import Salt libs
import salt.utils.files
import salt.utils.platform
import salt.utils.stringutils
if salt.utils.platform.is_windows():
import salt.utils.win_functions
@ -1611,11 +1612,11 @@ def dedent(text, linesep=os.linesep):
'''
A wrapper around textwrap.dedent that also sets line endings.
'''
linesep = salt.utils.to_unicode(linesep)
unicode_text = textwrap.dedent(salt.utils.to_unicode(text))
linesep = salt.utils.stringutils.to_unicode(linesep)
unicode_text = textwrap.dedent(salt.utils.stringutils.to_unicode(text))
clean_text = linesep.join(unicode_text.splitlines())
if unicode_text.endswith(u'\n'):
clean_text += linesep
if not isinstance(text, six.text_type):
return salt.utils.to_bytes(clean_text)
return salt.utils.stringutils.to_bytes(clean_text)
return clean_text