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

Fix a couple of PY3 test failures in the rsync module

Browse source 
Fixes:
  - unit.modules.test_rsync.RsyncTestCase.test_rsync
  - unit.modules.test_rsync.RsyncTestCase.test_version
This commit is contained in:
rallytime 2017-12-15 14:32:32 -05:00
parent 76a4d70449
commit ecb1e3cf82
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/rsync.py
View file

@ -7,7 +7,7 @@ Wrapper for rsync
This data can also be passed into :ref:`pillar <pillar-walk-through>`.
Options passed into opts will overwrite options passed into pillar.
'''
from __future__ import absolute_import
from __future__ import absolute_import, unicode_literals
# Import python libs
import errno

6
tests/unit/modules/test_rsync.py
View file

@ -3,7 +3,7 @@
:codeauthor: :email:`Jayesh Kariya <jayeshk@saltstack.com>`
'''
# Import Python libs
from __future__ import absolute_import
from __future__ import absolute_import, unicode_literals
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
@ -37,7 +37,7 @@ class RsyncTestCase(TestCase, LoaderModuleMockMixin):
with patch.dict(rsync.__salt__,
{'config.option': MagicMock(return_value='A'),
'cmd.run_all': MagicMock(side_effect=[IOError('f'),
'cmd.run_all': MagicMock(side_effect=[OSError(1, 'f'),
'A'])}):
with patch.object(rsync, '_check', return_value=['A']):
self.assertRaises(CommandExecutionError, rsync.rsync, 'a', 'b')
@ -48,7 +48,7 @@ class RsyncTestCase(TestCase, LoaderModuleMockMixin):
'''
Test for return rsync version
'''
mock = MagicMock(side_effect=[IOError('f'), 'A B C\n'])
mock = MagicMock(side_effect=[OSError(1, 'f'), 'A B C\n'])
with patch.dict(rsync.__salt__, {'cmd.run_stdout': mock}):
self.assertRaises(CommandExecutionError, rsync.version)