Fix JSON quoting bug

Quotes around the extra-vars JSON only make sense in a shell.
Shells strip those quotes off and pass the whole thing in to the
application. Ansible couldn't parse or understand the JSON with the
quotes in place, so remove them and fix the tests accordingly.

Author: cognifloyd

actions/lib/ansible_base.py

@@ -68,7 +68,7 @@ def _parse_extra_vars(self):
 
                     # Add --extra-vars for each json object
                     elif t == 'json':
-                        self.args.append("--extra-vars='{0}'".format(json.dumps(v)))
+                        self.args.append("--extra-vars={0}".format(json.dumps(v)))
 
                     # Combine contiguous kwarg vars into a single space-separated --extra-vars kwarg
                     elif t == 'kwarg' and last != t:
@@ -114,17 +114,14 @@ def _json_output_arg(self):
     def handle_json_arg(self):
         pass
 
-    def popen_call(self, p):
-        return p.wait()
-
     def execute(self):
         """
         Execute the command and stream stdout and stderr output
         from child process as it appears without delay.
         Terminate with child's exit code.
         """
-        p = subprocess.Popen(self.cmd, env=os.environ.copy(), stdout=self.stdout)
-        exit_code = self.popen_call(p)
+
+        exit_code = subprocess.call(self.cmd, env=os.environ.copy(), stdout=self.stdout)
         if exit_code is not 0:
             sys.stderr.write('Executed command "%s"\n' % ' '.join(self.cmd))
 

tests/test_actions_lib_ansiblebaserunner.py

@@ -86,7 +86,7 @@ def extra_vars_json_yaml_fixture(self, test_name):
         test_yaml = self.load_yaml('extra_vars_json.yaml')
         test = next(t for t in test_yaml if t['name'] == test_name)
         case = test['test']
-        expected = ['--extra-vars=\'{}\''.format(json.dumps(e)) for e in case]
+        expected = ['--extra-vars={}'.format(json.dumps(e)) for e in case]
         self.check_arg_parse(arg, case, expected)
 
     def test_parse_extra_vars_json_yaml_dict(self):
@@ -115,7 +115,7 @@ def extra_vars_complex_yaml_fixture(self, test_name):
         # this does not preserve the order exactly, but it shows that elements are correctly parsed
         expected = ['--extra-vars={}'.format(e)
                     for e in test['expected'] if isinstance(e, six.string_types)]
-        expected.extend(['--extra-vars=\'{}\''.format(json.dumps(e))
+        expected.extend(['--extra-vars={}'.format(json.dumps(e))
                          for e in test['expected'] if isinstance(e, dict)])
         self.check_arg_parse(arg, case, expected)