Revert "Fix make tests-py3 on devel. Fix for https://github.com/ansible/ansible/issues/13638."

This reverts commit e70061334a.

Going to do this in the connection plugins
This commit is contained in:
Toshio Kuratomi 2015-12-22 11:12:14 -08:00
parent 559ba467c0
commit 1ed3a018eb

View file

@ -42,14 +42,14 @@ class TestActionBase(unittest.TestCase):
play_context.become = True
play_context.become_user = play_context.remote_user = 'root'
play_context.make_become_cmd = Mock(return_value=b'CMD')
play_context.make_become_cmd = Mock(return_value='CMD')
action_base._low_level_execute_command(b'ECHO', sudoable=True)
action_base._low_level_execute_command('ECHO', sudoable=True)
play_context.make_become_cmd.assert_not_called()
play_context.remote_user = 'apo'
action_base._low_level_execute_command(b'ECHO', sudoable=True)
play_context.make_become_cmd.assert_called_once_with(b'ECHO', executable=None)
action_base._low_level_execute_command('ECHO', sudoable=True)
play_context.make_become_cmd.assert_called_once_with('ECHO', executable=None)
play_context.make_become_cmd.reset_mock()
@ -57,7 +57,7 @@ class TestActionBase(unittest.TestCase):
C.BECOME_ALLOW_SAME_USER = True
try:
play_context.remote_user = 'root'
action_base._low_level_execute_command(b'ECHO SAME', sudoable=True)
play_context.make_become_cmd.assert_called_once_with(b'ECHO SAME', executable=None)
action_base._low_level_execute_command('ECHO SAME', sudoable=True)
play_context.make_become_cmd.assert_called_once_with('ECHO SAME', executable=None)
finally:
C.BECOME_ALLOW_SAME_USER = become_allow_same_user