tests: Deal with Python output differences.

[cascardo/ovs.git] / tests / test-json.py

diff --git a/tests/test-json.py b/tests/test-json.py
index c97d46d..6750481 100644 (file)
--- a/tests/test-json.py
+++ b/tests/test-json.py
@@ -19,10 +19,11 @@ import getopt
 import sys
 
 import ovs.json
+import six
 
 
 def print_json(json):
-    if type(json) in [str, unicode]:
+    if isinstance(json, six.string_types):
         print("error: %s" % json)
         return False
     else:
@@ -57,9 +58,11 @@ def parse_multiple(stream):
 def main(argv):
     argv0 = argv[0]
 
-    # Make stdout and stderr UTF-8, even if they are redirected to a file.
-    sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
-    sys.stderr = codecs.getwriter("utf-8")(sys.stderr)
+    # When this is used with Python 3, the program produces no output.
+    if sys.version_info[0] == 2:
+        # Make stdout and stderr UTF-8, even if they are redirected to a file.
+        sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
+        sys.stderr = codecs.getwriter("utf-8")(sys.stderr)
 
     try:
         options, args = getopt.gnu_getopt(argv[1:], '', ['multiple'])