More work on getting integration tests running for v2

v2/ansible/plugins/action/__init__.py

@@ -31,7 +31,7 @@ from ansible import constants as C
 from ansible.errors import AnsibleError
 from ansible.executor.module_common import ModuleReplacer
 from ansible.parsing.utils.jsonify import jsonify
-from ansible.plugins import module_loader, shell_loader
+from ansible.plugins import shell_loader
 
 from ansible.utils.debug import debug
 
@@ -44,11 +44,12 @@ class ActionBase:
     action in use.
     '''
 
-    def __init__(self, task, connection, connection_info, loader):
+    def __init__(self, task, connection, connection_info, loader, module_loader):
         self._task            = task
         self._connection      = connection
         self._connection_info = connection_info
         self._loader          = loader
+        self._module_loader   = module_loader
         self._shell           = self.get_shell()
 
     def get_shell(self):
@@ -80,9 +81,9 @@ class ActionBase:
 
         # Search module path(s) for named module.
         module_suffixes = getattr(self._connection, 'default_suffixes', None)
-        module_path = module_loader.find_plugin(module_name, module_suffixes, transport=self._connection.get_transport())
+        module_path = self._module_loader.find_plugin(module_name, module_suffixes, transport=self._connection.get_transport())
         if module_path is None:
-            module_path2 = module_loader.find_plugin('ping', module_suffixes)
+            module_path2 = self._module_loader.find_plugin('ping', module_suffixes)
             if module_path2 is not None:
                 raise AnsibleError("The module %s was not found in configured module paths" % (module_name))
             else:
@@ -391,6 +392,10 @@ class ActionBase:
             data = json.loads(self._filter_leading_non_json_lines(res['stdout']))
             if 'parsed' in data and data['parsed'] == False:
                 data['msg'] += res['stderr']
+            # pre-split stdout into lines, if stdout is in the data and there
+            # isn't already a stdout_lines value there
+            if 'stdout' in data and 'stdout_lines' not in data:
+                data['stdout_lines'] = data.get('stdout', '').splitlines()
         else:
             data = dict()
 
@@ -424,7 +429,6 @@ class ActionBase:
                 cmd, prompt, success_key = self._connection_info.make_sudo_cmd('/usr/bin/sudo', executable, cmd)
 
         debug("executing the command through the connection")
-        #rc, stdin, stdout, stderr = self._connection.exec_command(cmd, tmp, executable=executable, in_data=in_data, sudoable=sudoable)
         rc, stdin, stdout, stderr = self._connection.exec_command(cmd, tmp, executable=executable, in_data=in_data)
         debug("command execution done")
 

v2/ansible/plugins/action/assert.py

@@ -16,6 +16,7 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 from ansible.errors import AnsibleError
+from ansible.playbook.conditional import Conditional
 from ansible.plugins.action import ActionBase
 
 class ActionModule(ActionBase):
@@ -42,9 +43,10 @@ class ActionModule(ActionBase):
         # the built in evaluate function. The when has already been evaluated
         # by this point, and is not used again, so we don't care about mangling
         # that value now
+        cond = Conditional(loader=self._loader)
         for that in thats:
-            self._task.when = [ that ]
-            test_result = self._task.evaluate_conditional(all_vars=task_vars)
+            cond.when = [ that ]
+            test_result = cond.evaluate_conditional(all_vars=task_vars)
             if not test_result:
                 result = dict(
                    failed       = True,

v2/ansible/plugins/action/script.py

@@ -63,12 +63,10 @@ class ActionModule(ActionBase):
         source = parts[0]
         args   = ' '.join(parts[1:])
 
-        # FIXME: need to sort out all the _original_file stuff still
-        #if '_original_file' in task_vars:
-        #    source = self._loader.path_dwim_relative(inject['_original_file'], 'files', source, self.runner.basedir)
-        #else:
-        #    source = self._loader.path_dwim(self.runner.basedir, source)
-        source = self._loader.path_dwim(source)
+        if self._task._role is not None:
+            source = self._loader.path_dwim_relative(self._task._role._role_path, 'files', source)
+        else:
+            source = self._loader.path_dwim(source)
 
         # transfer the file to a remote tmp location
         tmp_src = self._shell.join_path(tmp, os.path.basename(source))

v2/ansible/plugins/action/set_fact.py

@@ -17,10 +17,17 @@
 
 from ansible.errors import AnsibleError
 from ansible.plugins.action import ActionBase
+from ansible.template import Templar
 
 class ActionModule(ActionBase):
 
     TRANSFERS_FILES = False
 
     def run(self, tmp=None, task_vars=dict()):
-        return dict(changed=True, ansible_facts=self._task.args)
+        templar = Templar(loader=self._loader, variables=task_vars)
+        facts = dict()
+        if self._task.args:
+            for (k, v) in self._task.args.iteritems():
+                k = templar.template(k)
+                facts[k] = v
+        return dict(changed=True, ansible_facts=facts)