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 #49364 from rallytime/bp-49243

Browse source 
Back-port #49243 to 2018.3.3
This commit is contained in:
Nicole Thomas 2018-08-28 12:55:54 -04:00 • committed by GitHub
commit bbff57da16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/fileserver/test_roots.py
View file

@ -68,7 +68,7 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
with salt.utils.files.fopen(full_path_to_file, 'rb') as s_fp:
with salt.utils.files.fopen(os.path.join(cls.tmp_dir, 'testfile'), 'wb') as d_fp:
for line in s_fp:
d_fp.write(line.rstrip(b'\n').rstrip(b'\r') + b'\n')
d_fp.write(line)
@classmethod
def tearDownClass(cls):