Tracebacks are now catchable with ignore_errors and have streamlined output. Also removes 'baby-JSON' for bash modules.

test/units/TestUtils.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import traceback
 import unittest
 import os
 import os.path
@@ -217,36 +218,23 @@ class TestUtils(unittest.TestCase):
         # leading junk
         self.assertEqual(ansible.utils.parse_json('ansible\n{"foo": "bar"}'), dict(foo="bar"))
 
-        # "baby" json
-        self.assertEqual(ansible.utils.parse_json('foo=bar baz=qux'), dict(foo='bar', baz='qux'))
-
         # No closing quotation
         try:
-            ansible.utils.parse_json('foo=bar "')
+            rc = ansible.utils.parse_json('foo=bar "')
+            print rc
         except ValueError:
             pass
         else:
+            traceback.print_exc()
             raise AssertionError('Incorrect exception, expected ValueError')
 
         # Failed to parse
         try:
             ansible.utils.parse_json('{')
-        except ansible.errors.AnsibleError:
+        except ValueError:
             pass
         else:
-            raise AssertionError('Incorrect exception, expected ansible.errors.AnsibleError')
-
-        # boolean changed/failed
-        self.assertEqual(ansible.utils.parse_json('changed=true'), dict(changed=True))
-        self.assertEqual(ansible.utils.parse_json('changed=false'), dict(changed=False))
-        self.assertEqual(ansible.utils.parse_json('failed=true'), dict(failed=True))
-        self.assertEqual(ansible.utils.parse_json('failed=false'), dict(failed=False))
-
-        # rc
-        self.assertEqual(ansible.utils.parse_json('rc=0'), dict(rc=0))
-
-        # Just a string
-        self.assertEqual(ansible.utils.parse_json('foo'), dict(failed=True, parsed=False, msg='foo'))
+            raise AssertionError('Incorrect exception, expected ValueError')
 
     def test_parse_yaml(self):
         #json

test/units/inventory_test_data/inventory_api.py

@@ -34,8 +34,11 @@ if options.host is not None:
     if options.extra:
         k,v = options.extra.split("=")
         variables[options.host][k] = v
-    print json.dumps(variables[options.host])
+    if options.host in variables:
+        print json.dumps(variables[options.host])
+    else:
+        print "{}"
     sys.exit(0)
 
 parser.print_help()
-sys.exit(1)
+sys.exit(1)