From ea6ec3bf2c9734a8f6d7dab06f9f5771273f69c1 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marca@surveymonkey.com>
Date: Thu, 2 Jul 2015 18:16:33 +0000
Subject: [PATCH 1/3] Make test-module work in v2

- `jsonify` moved from `ansible.utils` to `ansible.parsing.utils.jsonify`
- I don't see `ansible.utils.parse_json` anymore so I used `json.loads`.
---
 hacking/test-module | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hacking/test-module b/hacking/test-module
index c226f32e88..03930c6b74 100755
--- a/hacking/test-module
+++ b/hacking/test-module
@@ -35,6 +35,7 @@ import subprocess
 import traceback
 import optparse
 import ansible.utils as utils
+from ansible.parsing.utils.jsonify import jsonify
 import ansible.module_common as module_common
 import ansible.constants as C
 
@@ -75,7 +76,7 @@ def write_argsfile(argstring, json=False):
     argsfile = open(argspath, 'w')
     if json:
         args = utils.parse_kv(argstring)
-        argstring = utils.jsonify(args)
+        argstring = jsonify(args)
     argsfile.write(argstring)
     argsfile.close()
     return argspath
@@ -150,7 +151,7 @@ def runtest( modfile, argspath):
         print "RAW OUTPUT"
         print out
         print err
-        results = utils.parse_json(out)
+        results = json.loads(out)
     except:
         print "***********************************"
         print "INVALID OUTPUT FORMAT"
@@ -160,7 +161,7 @@ def runtest( modfile, argspath):
 
     print "***********************************"
     print "PARSED OUTPUT"
-    print utils.jsonify(results,format=True)
+    print jsonify(results,format=True)
 
 def rundebug(debugger, modfile, argspath):
     """Run interactively with console debugger."""

From 5466ff89077a53b594bbc185a65a11b13755f44a Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marca@surveymonkey.com>
Date: Thu, 2 Jul 2015 18:57:57 +0000
Subject: [PATCH 2/3] hacking/test-module: Deal with move of parse_kv

---
 hacking/test-module | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hacking/test-module b/hacking/test-module
index 03930c6b74..3f9c84a529 100755
--- a/hacking/test-module
+++ b/hacking/test-module
@@ -36,6 +36,7 @@ import traceback
 import optparse
 import ansible.utils as utils
 from ansible.parsing.utils.jsonify import jsonify
+from ansible.parsing.splitter import parse_kv
 import ansible.module_common as module_common
 import ansible.constants as C
 
@@ -75,7 +76,7 @@ def write_argsfile(argstring, json=False):
     argspath = os.path.expanduser("~/.ansible_test_module_arguments")
     argsfile = open(argspath, 'w')
     if json:
-        args = utils.parse_kv(argstring)
+        args = parse_kv(argstring)
         argstring = jsonify(args)
     argsfile.write(argstring)
     argsfile.close()

From 3b0524e67d95ea856ade830a189ac8aadc1db1e4 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marca@surveymonkey.com>
Date: Thu, 2 Jul 2015 18:59:58 +0000
Subject: [PATCH 3/3] hacking/test-module: Style nit

---
 hacking/test-module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hacking/test-module b/hacking/test-module
index 3f9c84a529..953f834aad 100755
--- a/hacking/test-module
+++ b/hacking/test-module
@@ -177,7 +177,7 @@ def main():
     options, args = parse()
     (modfile, module_style) = boilerplate_module(options.module_path, options.module_args, options.interpreter, options.check)
 
-    argspath=None
+    argspath = None
     if module_style != 'new':
         if module_style == 'non_native_want_json':
             argspath = write_argsfile(options.module_args, json=True)