X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-trigger.at;h=1da63364858f42f52f89c525895d9c7340fd9094;hb=003ce655b7116d18c86a74c50391e54990346931;hp=97330fb5f710440295543b3037c4a9a02c992b1d;hpb=7c126fbb8a0589f2a29f3e7c520723a2d74b254e;p=sliver-openvswitch.git

diff --git a/tests/ovsdb-trigger.at b/tests/ovsdb-trigger.at
index 97330fb5f..1da633648 100644
--- a/tests/ovsdb-trigger.at
+++ b/tests/ovsdb-trigger.at
@@ -9,12 +9,13 @@ m4_define([OVSDB_CHECK_TRIGGER],
   [AT_SETUP([$1])
    AT_KEYWORDS([ovsdb execute execution trigger positive $4])
    AT_CHECK([test-ovsdb trigger $2], [0], [stdout], [])
-   AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [$3])
+   AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [$3])
    AT_CLEANUP])
 
 OVSDB_CHECK_TRIGGER([trigger fires immediately],
-  ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+  ["`ordinal_schema`" [\
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}},
       {"op": "insert",
@@ -35,8 +36,9 @@ OVSDB_CHECK_TRIGGER([trigger fires immediately],
 ]])
 
 OVSDB_CHECK_TRIGGER([trigger times out],
-  ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+  ["`ordinal_schema`" [\
+    '["ordinals",
+      {"op": "insert",
        "table": "ordinals",
        "row": {"number": 0, "name": "zero"}},
       {"op": "insert",
@@ -57,15 +59,17 @@ t=10: trigger 0 (delayed): [{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]},{"de
 ]])
 
 OVSDB_CHECK_TRIGGER([trigger fires after delay],
-  ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+  ["`ordinal_schema`" [\
+    '["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>"]}]
@@ -85,15 +90,17 @@ t=10: trigger 1 (delayed): [{}]
 ]])
 
 OVSDB_CHECK_TRIGGER([delayed trigger modifies database],
-  ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+  ["`ordinal_schema`" [\
+    '["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>"]}]
@@ -121,15 +130,17 @@ t=15: trigger 3 (immediate): [{"rows":[{"_uuid":["uuid","<2>"],"_version":["uuid
 ]])
 
 OVSDB_CHECK_TRIGGER([one delayed trigger wakes up another],
-  ['ORDINAL_SCHEMA' [\
-    '[{"op": "insert",
+  ["`ordinal_schema`" [\
+    '["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>"]}]