Test the Python C JSON extension

The C JSON parser was added quite a while ago, but unless you
configure with --enable-shared and have the Python 2/3 development
libraries installed, and the resulting python-ovs module installed,
'make check' won't actually test it.

This patch changes Python-based tests to run from the
$builddir/python directory and makes the tests configurable to use
both JSON backends. There are some unicode failures in the C JSON
extension that I left unfixed in this patch to make it easy to
show run the new tests on broken code. The next patch in this set
works around the issue.

Signed-off-by: Terry Wilson <twilson@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Lucas Alvares Gomes <lucasagomes@gmail.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/tests/test-json.py b/tests/test-json.py
index 582aa720a..d0db43331 100644
--- a/tests/test-json.py
+++ b/tests/test-json.py
@@ -18,6 +18,7 @@ import codecs
 import getopt
 import sys
 
+from ovs.db import error
 import ovs.json
 
 import six
@@ -66,15 +67,26 @@ def main(argv):
         sys.stderr = codecs.getwriter("utf-8")(sys.stderr)
 
     try:
-        options, args = getopt.gnu_getopt(argv[1:], '', ['multiple'])
+        options, args = getopt.gnu_getopt(argv[1:], 'j:',
+                                          ['multiple', 'json-parser'])
     except getopt.GetoptError as geo:
         sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
         sys.exit(1)
 
     multiple = False
+    ORIG_PARSER = ovs.json.PARSER
+    ovs.json.PARSER = ovs.json.PARSER_PY
     for key, value in options:
         if key == '--multiple':
             multiple = True
+        elif key in ('-j', '--json-parser'):
+            if value == "python":
+                ovs.json.PARSER = ovs.json.PARSER_PY
+            elif value in ('C', 'c'):
+                if ORIG_PARSER != ovs.json.PARSER_C:
+                    raise error.Error("C parser selected, but not compiled")
+                else:
+                    ovs.json.PARSER = ovs.json.PARSER_C
         else:
             sys.stderr.write("%s: unhandled option %s\n" % (argv0, key))
             sys.exit(1)