ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Use _remote_is_local=True for local connection in synchronize (#40833)

Browse source 
* All instances of local connection should use _remote_is_local=True. Fixes #40551

* Switch to instance attribute for synchronize

* Add test that shows that synchronize _remote_is_local addresses tmpdir building
This commit is contained in:
Matt Martz 2018-05-30 15:28:11 -05:00 committed by Matt Davis
parent d0f43bc6f8
commit ad7ba91f75
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/plugins/action/synchronize.py
View file

@ -301,6 +301,9 @@ class ActionModule(ActionBase):
new_connection = connection_loader.get('local', self._play_context, new_stdin) new_connection = connection_loader.get('local', self._play_context, new_stdin)
self._connection = new_connection self._connection = new_connection
# Override _remote_is_local as an instance attribute specifically for the synchronize use case
# ensuring we set local tmpdir correctly
self._connection._remote_is_local = True
self._override_module_replaced_vars(task_vars) self._override_module_replaced_vars(task_vars)
# SWITCH SRC AND DEST HOST PER MODE # SWITCH SRC AND DEST HOST PER MODE

16
test/units/plugins/action/test_synchronize.py
View file

@ -42,6 +42,10 @@ with open('task_vars.json', 'wb') as f:
''' '''
class BreakPoint(Exception):
pass
class TaskMock(object): class TaskMock(object):
args = {'src': u'/tmp/deleteme', args = {'src': u'/tmp/deleteme',
'dest': '/tmp/deleteme', 'dest': '/tmp/deleteme',
@ -246,3 +250,15 @@ class TestSynchronizeAction(unittest.TestCase):
# delegate to other remote host with su enabled # delegate to other remote host with su enabled
x = SynchronizeTester() x = SynchronizeTester()
x.runtest(fixturepath=os.path.join(self.fixturedir, 'delegate_remote_su')) x.runtest(fixturepath=os.path.join(self.fixturedir, 'delegate_remote_su'))
@patch.object(ActionModule, '_low_level_execute_command', side_effect=BreakPoint)
@patch.object(ActionModule, '_remote_expand_user', side_effect=ActionModule._remote_expand_user, autospec=True)
def test_remote_user_not_in_local_tmpdir(self, spy_remote_expand_user, ll_ec):
x = SynchronizeTester()
SAM = ActionModule(x.task, x.connection, x._play_context,
x.loader, x.templar, x.shared_loader_obj)
try:
SAM.run(task_vars={'hostvars': {'foo': {}, 'localhost': {}}, 'inventory_hostname': 'foo'})
except BreakPoint:
pass
self.assertEqual(spy_remote_expand_user.call_count, 0)