jsonrpc-py.at: Run tests with Python 2 and 3.

Convert these Python tests to run with both Python 2 and 3.

Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>

1 files changed, 47 insertions, 32 deletions

diff --git a/tests/jsonrpc-py.at b/tests/jsonrpc-py.at
index 3d3bd3b10..966741d0e 100644
--- a/tests/jsonrpc-py.at
+++ b/tests/jsonrpc-py.at
@@ -1,39 +1,51 @@
 AT_BANNER([JSON-RPC - Python])
 
-AT_SETUP([JSON-RPC request and successful reply - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
-AT_CHECK([$PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket])
-AT_CHECK([test -s pid])
-AT_CHECK([kill -0 `cat pid`])
-AT_CHECK(
-  [[$PYTHON $srcdir/test-jsonrpc.py request unix:socket echo '[{"a": "b", "x": null}]']], [0],
-  [[{"error":null,"id":0,"result":[{"a":"b","x":null}]}
+m4_define([JSONRPC_REQ_REPLY_SUCCESS_PYN],
+  [AT_SETUP([JSON-RPC request and successful reply - $1])
+   AT_SKIP_IF([test $2 = no])
+   AT_KEYWORDS([python jsonrpc])
+   AT_CHECK([$PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket])
+   AT_CHECK([test -s pid])
+   AT_CHECK([kill -0 `cat pid`])
+   AT_CHECK(
+     [[$3 $srcdir/test-jsonrpc.py request unix:socket echo '[{"a": "b", "x": null}]']], [0],
+     [[{"error":null,"id":0,"result":[{"a":"b","x":null}]}
 ]], [], [test ! -e pid || kill `cat pid`])
-AT_CHECK([kill `cat pid`])
-AT_CLEANUP
+   AT_CHECK([kill `cat pid`])
+   AT_CLEANUP])
 
-AT_SETUP([JSON-RPC request and error reply - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
-AT_CHECK([$PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket])
-AT_CHECK([test -s pid])
-AT_CHECK([kill -0 `cat pid`])
-AT_CHECK(
-  [[$PYTHON $srcdir/test-jsonrpc.py request unix:socket bad-request '[]']], [0],
-  [[{"error":{"error":"unknown method"},"id":0,"result":null}
+JSONRPC_REQ_REPLY_SUCCESS_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
+JSONRPC_REQ_REPLY_SUCCESS_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3])
+
+m4_define([JSONRPC_REQ_REPLY_ERROR_PYN],
+  [AT_SETUP([JSON-RPC request and error reply - $1])
+   AT_SKIP_IF([test $2 = no])
+   AT_KEYWORDS([python jsonrpc])
+   AT_CHECK([$PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket])
+   AT_CHECK([test -s pid])
+   AT_CHECK([kill -0 `cat pid`])
+   AT_CHECK(
+     [[$3 $srcdir/test-jsonrpc.py request unix:socket bad-request '[]']], [0],
+     [[{"error":{"error":"unknown method"},"id":0,"result":null}
 ]], [], [test ! -e pid || kill `cat pid`])
-AT_CHECK([kill `cat pid`])
-AT_CLEANUP
+   AT_CHECK([kill `cat pid`])
+   AT_CLEANUP])
+
+JSONRPC_REQ_REPLY_ERROR_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
+JSONRPC_REQ_REPLY_ERROR_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3])
 
-AT_SETUP([JSON-RPC notification - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
-AT_CHECK([$PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket])
-AT_CHECK([test -s pid])
-# When a daemon dies it deletes its pidfile, so make a copy.
-AT_CHECK([cp pid pid2])
-AT_CHECK([kill -0 `cat pid2`])
-AT_CHECK([[$PYTHON $srcdir/test-jsonrpc.py notify unix:socket shutdown '[]']], [0], [], 
-  [], [kill `cat pid2`])
-AT_CHECK(
+m4_define([JSONRPC_NOTIFICATION_PYN],
+  [AT_SETUP([JSON-RPC notification - $1])
+   AT_SKIP_IF([test $2 = no])
+   AT_KEYWORDS([python jsonrpc])
+   AT_CHECK([$3 $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen punix:socket])
+   AT_CHECK([test -s pid])
+   # When a daemon dies it deletes its pidfile, so make a copy.
+   AT_CHECK([cp pid pid2])
+   AT_CHECK([kill -0 `cat pid2`])
+   AT_CHECK([[$3 $srcdir/test-jsonrpc.py notify unix:socket shutdown '[]']], [0], [],
+            [], [kill `cat pid2`])
+   AT_CHECK(
   [pid=`cat pid2`
    # First try a quick sleep, so that the test completes very quickly
    # in the normal case.  POSIX doesn't require fractional times to
@@ -44,5 +56,8 @@ AT_CHECK(
    sleep 1; if kill -0 $pid; then :; else echo success; exit 0; fi
    echo failure; exit 1], [0], [success
 ], [ignore])
-AT_CHECK([test ! -e pid])
-AT_CLEANUP
+   AT_CHECK([test ! -e pid])
+   AT_CLEANUP])
+
+JSONRPC_NOTIFICATION_PYN([Python2], [$HAVE_PYTHON], [$PYTHON])
+JSONRPC_NOTIFICATION_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3])