X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-trigger.at;h=c2b1b967566d41d7d7c495ae5397eb1532f7b779;hb=d15a5ee594f46a855788652e687aa5d736d530fb;hp=49ac69fa5e67c0df43347336a4c1f1d0539b94f2;hpb=21ff1aee1b186405c2471bf83a3e8a016a1d2256;p=sliver-openvswitch.git

diff --git a/tests/ovsdb-trigger.at b/tests/ovsdb-trigger.at
index 49ac69fa5..c2b1b9675 100644
--- a/tests/ovsdb-trigger.at
+++ b/tests/ovsdb-trigger.at
@@ -8,13 +8,14 @@ AT_BANNER([OVSDB -- triggers])
 m4_define([OVSDB_CHECK_TRIGGER], 
   [AT_SETUP([$1])
    AT_KEYWORDS([ovsdb execute execution trigger positive $4])
-   OVS_CHECK_LCOV([test-ovsdb trigger $2], [0], [stdout], [])
+   AT_CHECK([test-ovsdb trigger $2], [0], [stdout], [])
    AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [$3])
    AT_CLEANUP])
 
 OVSDB_CHECK_TRIGGER([trigger fires immediately],
   ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}},
       {"op": "insert",
@@ -36,7 +37,8 @@ OVSDB_CHECK_TRIGGER([trigger fires immediately],
 
 OVSDB_CHECK_TRIGGER([trigger times out],
   ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}},
       {"op": "insert",
@@ -58,14 +60,16 @@ t=10: trigger 0 (delayed): [{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]},{"de
 
 OVSDB_CHECK_TRIGGER([trigger fires after delay],
   ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}},
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]' \
     '["advance", 5]' \
-    '[{"op": "wait",
+    '["ordinals",
+      {"op": "wait",
        "timeout": 10,
        "table": "ordinals",
        "where": [],
@@ -75,7 +79,8 @@ OVSDB_CHECK_TRIGGER([trigger fires after delay],
                 {"name": "one", "number": 1},
                 {"name": "two", "number": 2}]}]' \
     '["advance", 5]' \
-    '[{"op": "insert",
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]']],
   [[t=0: trigger 0 (immediate): [{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]
@@ -86,14 +91,16 @@ t=10: trigger 1 (delayed): [{}]
 
 OVSDB_CHECK_TRIGGER([delayed trigger modifies database],
   ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}},
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]' \
     '["advance", 5]' \
-    '[{"op": "wait",
+    '["ordinals",
+      {"op": "wait",
        "timeout": 10,
        "table": "ordinals",
        "where": [],
@@ -106,11 +113,13 @@ OVSDB_CHECK_TRIGGER([delayed trigger modifies database],
        "table": "ordinals",
        "where": [["number", "<", 2]]}]' \
     '["advance", 5]' \
-    '[{"op": "insert",
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]' \
     '["advance", 5]' \
-    '[{"op": "select",
+    '["ordinals",
+      {"op": "select",
        "table": "ordinals",
        "where": []}]']],
   [[t=0: trigger 0 (immediate): [{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]
@@ -122,14 +131,16 @@ t=15: trigger 3 (immediate): [{"rows":[{"_uuid":["uuid","<2>"],"_version":["uuid
 
 OVSDB_CHECK_TRIGGER([one delayed trigger wakes up another],
   ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}},
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 1, "name": "one"}}]' \
     '["advance", 5]' \
-    '[{"op": "wait",
+    '["ordinals",
+      {"op": "wait",
        "timeout": 10,
        "table": "ordinals",
        "where": [],
@@ -142,7 +153,8 @@ OVSDB_CHECK_TRIGGER([one delayed trigger wakes up another],
       {"op": "insert",
        "table": "ordinals",
        "row": {"number": 3, "name": "three"}}]' \
-    '[{"op": "wait",
+    '["ordinals",
+      {"op": "wait",
        "timeout": 10,
        "table": "ordinals",
        "where": [],
@@ -155,11 +167,13 @@ OVSDB_CHECK_TRIGGER([one delayed trigger wakes up another],
        "table": "ordinals",
        "where": [["number", "<", 2]]}]' \
     '["advance", 5]' \
-    '[{"op": "insert",
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 2, "name": "two"}}]' \
     '["advance", 5]' \
-    '[{"op": "select",
+    '["ordinals",
+      {"op": "select",
        "table": "ordinals",
        "where": []}]']],
   [[t=0: trigger 0 (immediate): [{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]