X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovsdb-server.at;h=e73add80a2c26c08f541535b4e5b53786c1d84cc;hb=2280e7223cc5d014fe60ad3be45b8e4d9d401997;hp=359f7e2e76cab5ebb4d91b2fa39791f9015bd8fa;hpb=58fda1dab104041fc693032475ec4662c1a52849;p=openvswitch diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 359f7e2e..e73add80 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -20,15 +20,48 @@ m4_define([OVSDB_CHECK_EXECUTION], AT_DATA([schema], [$2 ]) OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --listen=punix:socket --unixctl=$PWD/unixctl db]) + AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) m4_foreach([txn], [$3], [OVS_CHECK_LCOV([ovsdb-client transact unix:socket 'txn'], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) cat stdout >> output ]) - AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4], [], + AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4], [ignore], [test ! -e pid || kill `cat pid`]) test ! -e pid || kill `cat pid` AT_CLEANUP]) EXECUTION_EXAMPLES + +AT_SETUP([--remote=db: implementation]) +AT_KEYWORDS([ovsdb server positive]) +AT_DATA([schema], + [[{"name": "mydb", + "tables": { + "Manager": { + "columns": { + "manager": {"type": "string"}}}}} +]]) +OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [ignore], [ignore]) +OVS_CHECK_LCOV( + [[ovsdb-tool transact db \ + '[{"op": "insert", + "table": "Manager", + "row": {"manager": "punix:socket"}}]']], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=db:Manager,manager --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) +OVS_CHECK_LCOV( + [[ovsdb-client transact unix:socket \ + '[{"op": "select", + "table": "Manager", + "where": [], + "columns": ["manager"]}]']], + [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) +AT_CHECK( + [perl $srcdir/uuidfilt.pl stdout], + [0], + [[[{"rows":[{"manager":"punix:socket"}]}] +]], + [ignore], + [test ! -e pid || kill `cat pid`]) +test ! -e pid || kill `cat pid` +AT_CLEANUP