From 3d77723e3d173bd1d1b702e4d04eb9c7dae08d9d Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Mon, 13 Jul 2015 16:46:51 -0400 Subject: [PATCH] Cleaning up some stuff related to the connection info/become/executable change --- lib/ansible/executor/connection_info.py | 3 +-- lib/ansible/plugins/action/__init__.py | 1 - .../executor/test_connection_information.py | 18 +++++++++--------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/ansible/executor/connection_info.py b/lib/ansible/executor/connection_info.py index 576ae745515..6c2676c3018 100644 --- a/lib/ansible/executor/connection_info.py +++ b/lib/ansible/executor/connection_info.py @@ -325,7 +325,6 @@ class ConnectionInformation: prompt = None success_key = None - print("in make_become_cmd, executable is: %s" % executable) if executable is None: executable = C.DEFAULT_EXECUTABLE @@ -381,7 +380,7 @@ class ConnectionInformation: self.success_key = success_key return ('%s -c ' % executable) + pipes.quote(becomecmd) - return ('%s -c ' % executable) + pipes.quote(cmd) + return cmd def _get_fields(self): return [i for i in self.__dict__.keys() if i[:1] != '_'] diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index a97328b832b..e47d9e7b6ad 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -429,7 +429,6 @@ class ActionBase: debug("no command, exiting _low_level_execute_command()") return dict(stdout='', stderr='') - print("in _low_level_execute_command, executable is: %s" % executable) if sudoable: cmd = self._connection_info.make_become_cmd(cmd, executable=executable) diff --git a/test/units/executor/test_connection_information.py b/test/units/executor/test_connection_information.py index 9258173f096..a0c5863bf3c 100644 --- a/test/units/executor/test_connection_information.py +++ b/test/units/executor/test_connection_information.py @@ -129,27 +129,27 @@ class TestConnectionInformation(unittest.TestCase): pfexec_exe = 'pfexec' pfexec_flags = '' - (cmd, prompt, key) = conn_info.make_become_cmd(cmd=default_cmd, executable=default_exe) + cmd = conn_info.make_become_cmd(cmd=default_cmd, executable=default_exe) self.assertEqual(cmd, default_cmd) conn_info.become = True conn_info.become_user = 'foo' conn_info.become_method = 'sudo' - (cmd, prompt, key) = conn_info.make_become_cmd(cmd=default_cmd, executable="/bin/bash") - self.assertEqual(cmd, """%s -c '%s -k && %s %s -S -p "%s" -u %s %s -c '"'"'echo %s; %s'"'"''""" % (default_exe, sudo_exe, sudo_exe, sudo_flags, prompt, conn_info.become_user, default_exe, key, default_cmd)) + cmd = conn_info.make_become_cmd(cmd=default_cmd, executable="/bin/bash") + self.assertEqual(cmd, """%s -c '%s -k && %s %s -S -p "%s" -u %s %s -c '"'"'echo %s; %s'"'"''""" % (default_exe, sudo_exe, sudo_exe, sudo_flags, conn_info.prompt, conn_info.become_user, default_exe, conn_info.success_key, default_cmd)) conn_info.become_method = 'su' - (cmd, prompt, key) = conn_info.make_become_cmd(cmd=default_cmd, executable="/bin/bash") - self.assertEqual(cmd, """%s -c '%s %s -c "%s -c '"'"'echo %s; %s'"'"'"'""" % (default_exe, su_exe, conn_info.become_user, default_exe, key, default_cmd)) + cmd = conn_info.make_become_cmd(cmd=default_cmd, executable="/bin/bash") + self.assertEqual(cmd, """%s -c '%s %s -c "%s -c '"'"'echo %s; %s'"'"'"'""" % (default_exe, su_exe, conn_info.become_user, default_exe, conn_info.success_key, default_cmd)) conn_info.become_method = 'pbrun' - (cmd, prompt, key) = conn_info.make_become_cmd(cmd=default_cmd, executable="/bin/bash") - self.assertEqual(cmd, """%s -c '%s -b %s -u %s '"'"'echo %s; %s'"'"''""" % (default_exe, pbrun_exe, pbrun_flags, conn_info.become_user, key, default_cmd)) + cmd = conn_info.make_become_cmd(cmd=default_cmd, executable="/bin/bash") + self.assertEqual(cmd, """%s -c '%s -b %s -u %s '"'"'echo %s; %s'"'"''""" % (default_exe, pbrun_exe, pbrun_flags, conn_info.become_user, conn_info.success_key, default_cmd)) conn_info.become_method = 'pfexec' - (cmd, prompt, key) = conn_info.make_become_cmd(cmd=default_cmd, executable="/bin/bash") - self.assertEqual(cmd, """%s -c '%s %s "'"'"'echo %s; %s'"'"'"'""" % (default_exe, pfexec_exe, pfexec_flags, key, default_cmd)) + cmd = conn_info.make_become_cmd(cmd=default_cmd, executable="/bin/bash") + self.assertEqual(cmd, """%s -c '%s %s "'"'"'echo %s; %s'"'"'"'""" % (default_exe, pfexec_exe, pfexec_flags, conn_info.success_key, default_cmd)) conn_info.become_method = 'bad' self.assertRaises(AnsibleError, conn_info.make_become_cmd, cmd=default_cmd, executable="/bin/bash")