valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add mode back in for tmp file creation on Linux

Browse Source 
The mode arg was removed in PR #41966 to get this test to pass on
Windows. However, this caused the same test to fail on Arch Linux
when running Python 3.

Let's keep the test the way it was for non-windows boxes, and only
remove the mode for windows.
This commit is contained in:
rallytime 2017-06-30 12:06:54 -06:00
parent 0000f0f975
commit f0416acc37
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/modules/test_ssh.py
View File

@ -91,8 +91,13 @@ class SSHAuthKeyTestCase(TestCase, LoaderModuleMockMixin):
email = 'github.com' email = 'github.com'
empty_line = '\n' empty_line = '\n'
comment_line = '# this is a comment \n' comment_line = '# this is a comment \n'
# Write out the authorized key to a temporary file # Write out the authorized key to a temporary file
temp_file = tempfile.NamedTemporaryFile(delete=False) if salt.utils.is_windows():
temp_file = tempfile.NamedTemporaryFile(delete=False)
else:
temp_file = tempfile.NamedTemporaryFile(delete=False, mode='w+')
# Add comment # Add comment
temp_file.write(comment_line) temp_file.write(comment_line)
# Add empty line for #41335 # Add empty line for #41335