X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovsdb-monitor.at;h=16e2471969a3057064d9ba9f29ee229dc1e439f8;hb=7446f1480bb27ccb63feab066d901cc940d52462;hp=f0b20e155f9756a99f965d195e93d6d4e447436f;hpb=b12e3c41afaeb9faed1e3562954ec78fd595677d;p=openvswitch

diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at
index f0b20e15..16e24719 100644
--- a/tests/ovsdb-monitor.at
+++ b/tests/ovsdb-monitor.at
@@ -20,19 +20,19 @@ m4_define([OVSDB_CHECK_MONITOR],
    AT_KEYWORDS([ovsdb server monitor positive $7])
    AT_DATA([schema], [$2
 ])
-   OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [stdout], [ignore])
+   AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore])
    m4_foreach([txn], [$3],
-     [OVS_CHECK_LCOV([ovsdb-tool transact db 'txn'], [0], [ignore], [ignore])])
-   AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --listen=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore])
-   AT_CHECK([ovsdb-client --detach --pidfile=$PWD/client-pid monitor --format=csv unix:socket $4 > output], 
+     [AT_CHECK([ovsdb-tool transact db 'txn'], [0], [ignore], [ignore])])
+   AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --remote=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore])
+   AT_CHECK([ovsdb-client --detach --pidfile=$PWD/client-pid -d json monitor --format=csv unix:socket ordinals $4 > output], 
             [0], [ignore], [ignore], [kill `cat server-pid`])
    m4_foreach([txn], [$5],
-     [OVS_CHECK_LCOV([ovsdb-client transact unix:socket 'txn'], [0],
+     [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0],
                      [ignore], [ignore], [kill `cat server-pid client-pid`])])
-   OVS_CHECK_LCOV([ovsdb-client transact unix:socket '[[]]'], [0],
-                  [ignore], [ignore], [kill `cat server-pid client-pid`])
+   AT_CHECK([ovsdb-client transact unix:socket '[[]]'], [0],
+            [ignore], [ignore], [kill `cat server-pid client-pid`])
    AT_CHECK([ovs-appctl -t $PWD/unixctl -e exit], [0], [ignore], [ignore])
-   OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid && exit 0])
+   OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid])
    AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$6], [ignore])
    AT_CLEANUP])
 
@@ -40,7 +40,8 @@ OVSDB_CHECK_MONITOR([monitor insert into empty table],
   [ORDINAL_SCHEMA],
   [],
   [ordinals],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]]]],
   [[row,action,name,number,_version
@@ -49,46 +50,55 @@ OVSDB_CHECK_MONITOR([monitor insert into empty table],
 
 OVSDB_CHECK_MONITOR([monitor insert into populated table],
   [ORDINAL_SCHEMA],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]]]],
   [ordinals],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}}]]]],
   [[row,action,name,number,_version
 <0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+
 row,action,name,number,_version
 <2>,insert,"""zero""",0,"[""uuid"",""<3>""]"
 ]])
 
 OVSDB_CHECK_MONITOR([monitor delete],
   [ORDINAL_SCHEMA],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]]]],
   [ordinals],
-  [[[[{"op": "delete",
+  [[[["ordinals",
+      {"op": "delete",
        "table": "ordinals",
        "where": [["number", "==", 10]]}]]]],
   [[row,action,name,number,_version
 <0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+
 row,action,name,number,_version
 <0>,delete,"""ten""",10,"[""uuid"",""<1>""]"
 ]])
 
 OVSDB_CHECK_MONITOR([monitor row update],
   [ORDINAL_SCHEMA],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]]]],
   [ordinals],
-  [[[[{"op": "update",
+  [[[["ordinals",
+      {"op": "update",
        "table": "ordinals",
        "where": [["number", "==", 10]],
        "row": {"name": "five plus five"}}]]]],
   [[row,action,name,number,_version
 <0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+
 row,action,name,number,_version
 <0>,old,"""ten""",,"[""uuid"",""<1>""]"
 ,new,"""five plus five""",10,"[""uuid"",""<2>""]"
@@ -96,30 +106,36 @@ row,action,name,number,_version
 
 OVSDB_CHECK_MONITOR([monitor no-op row updates],
   [ORDINAL_SCHEMA],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]]]],
   [ordinals],
-  [[[[{"op": "update",
+  [[[["ordinals",
+      {"op": "update",
        "table": "ordinals",
        "where": [["number", "==", 10]],
        "row": {"number": 10, "name": "ten"}}]]],
-   [[[{"op": "insert",
+   [[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 9, "name": "nine"}}]]]],
   [[row,action,name,number,_version
 <0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+
 row,action,name,number,_version
 <2>,insert,"""nine""",9,"[""uuid"",""<3>""]"
 ]])
 
 OVSDB_CHECK_MONITOR([monitor insert-and-update transaction],
   [ORDINAL_SCHEMA],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]]]],
   [ordinals],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 9, "name": "nine"},
        "uuid-name": "nine"},
@@ -129,6 +145,7 @@ OVSDB_CHECK_MONITOR([monitor insert-and-update transaction],
        "row": {"name": "three squared"}}]]]],
   [[row,action,name,number,_version
 <0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+
 row,action,name,number,_version
 <2>,insert,"""three squared""",9,"[""uuid"",""<3>""]"
 ]])
@@ -136,11 +153,13 @@ row,action,name,number,_version
 
 OVSDB_CHECK_MONITOR([monitor insert-update-and-delete transaction],
   [ORDINAL_SCHEMA],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 10, "name": "ten"}}]]]],
   [ordinals],
-  [[[[{"op": "insert",
+  [[[["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 9, "name": "nine"},
        "uuid-name": "nine"},
@@ -156,6 +175,7 @@ OVSDB_CHECK_MONITOR([monitor insert-update-and-delete transaction],
        "row": {"number": 7, "name": "seven"}}]]]],
   [[row,action,name,number,_version
 <0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+
 row,action,name,number,_version
 <2>,insert,"""seven""",7,"[""uuid"",""<3>""]"
 ]])