X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fjsonrpc.at;h=e06b5b6366028a5f89244fc19d00c6a5a16f65de;hb=cfc50ae514f805dcd9c14589f21158185424daf6;hp=83410f990c1e1bb709120406044df3add5d3ba19;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=sliver-openvswitch.git

diff --git a/tests/jsonrpc.at b/tests/jsonrpc.at
index 83410f990..e06b5b636 100644
--- a/tests/jsonrpc.at
+++ b/tests/jsonrpc.at
@@ -1,35 +1,38 @@
-AT_BANNER([JSON-RPC])
+AT_BANNER([JSON-RPC - C])
 
 AT_SETUP([JSON-RPC request and successful reply])
-AT_CHECK([test-jsonrpc --detach --pidfile=$PWD/pid listen punix:socket])
+OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+AT_CHECK([ovstest test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket])
 AT_CHECK([test -s pid])
 AT_CHECK([kill -0 `cat pid`])
 AT_CHECK(
-  [[test-jsonrpc request unix:socket echo '[{"a": "b", "x": null}]']], [0],
+  [[ovstest test-jsonrpc request unix:socket echo '[{"a": "b", "x": null}]']], [0],
   [[{"error":null,"id":0,"result":[{"a":"b","x":null}]}
-]], [ignore], [test ! -e pid || kill `cat pid`])
+]], [], [test ! -e pid || kill `cat pid`])
 AT_CHECK([kill `cat pid`])
 AT_CLEANUP
 
 AT_SETUP([JSON-RPC request and error reply])
-AT_CHECK([test-jsonrpc --detach --pidfile=$PWD/pid listen punix:socket])
+OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+AT_CHECK([ovstest test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket])
 AT_CHECK([test -s pid])
 AT_CHECK([kill -0 `cat pid`])
 AT_CHECK(
-  [[test-jsonrpc request unix:socket bad-request '[]']], [0],
+  [[ovstest test-jsonrpc request unix:socket bad-request '[]']], [0],
   [[{"error":{"error":"unknown method"},"id":0,"result":null}
-]], [ignore], [test ! -e pid || kill `cat pid`])
+]], [], [test ! -e pid || kill `cat pid`])
 AT_CHECK([kill `cat pid`])
 AT_CLEANUP
 
 AT_SETUP([JSON-RPC notification])
-AT_CHECK([test-jsonrpc --detach --pidfile=$PWD/pid listen punix:socket])
+OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+AT_CHECK([ovstest test-jsonrpc --detach --no-chdir --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([[test-jsonrpc notify unix:socket shutdown '[]']], [0], [], 
-  [ignore], [kill `cat pid2`])
+AT_CHECK([[ovstest test-jsonrpc 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