[ovs-dev] [PATCH 1/2] tests: Fix inconsistency tests in monitor

Liran Schour lirans at il.ibm.com
Sat Feb 20 16:35:49 UTC 2016


In case of delete only: !initial,!insert,!modify. We can not be sure that we
will see X if we have: insert X, delete X.
In case of modify only: !initial,!insert,!delete. We can not be sure that we
will see X modified if we have: insert X, modify X, delete X.

Signed-off-by: Liran Schour <lirans at il.ibm.com>
---
 tests/ovsdb-monitor.at | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at
index 0dbf5b0..5a85ea2 100644
--- a/tests/ovsdb-monitor.at
+++ b/tests/ovsdb-monitor.at
@@ -271,7 +271,7 @@ m4_define([OVSDB_MONITOR_TXNS],
    [[["ordinals",
       {"op": "delete",
        "table": "ordinals",
-       "where": []}]]]])
+       "where": [["name","==","ten"]]}]]]])
 
 OVSDB_CHECK_MONITOR([monitor all operations],
   [ordinal_schema], [OVSDB_MONITOR_INITIAL],
@@ -287,7 +287,6 @@ row,action,name,number,_version
 ,new,"""FIVE""",5,"[""uuid"",""<4>""]"
 
 row,action,name,number,_version
-<2>,delete,"""FIVE""",5,"[""uuid"",""<4>""]"
 <0>,delete,"""ten""",10,"[""uuid"",""<1>""]"
 ]])
 
@@ -311,14 +310,17 @@ OVSDB_CHECK_MONITOR([monitor delete only],
   [ordinal_schema], [OVSDB_MONITOR_INITIAL],
   [ordinals], [ordinals], [OVSDB_MONITOR_TXNS],
   [[row,action,name,number,_version
-<0>,delete,"""FIVE""",5,"[""uuid"",""<1>""]"
-<2>,delete,"""ten""",10,"[""uuid"",""<3>""]"
+<0>,delete,"""ten""",10,"[""uuid"",""<1>""]"
 ]], [!initial,!insert,!modify])
 
 OVSDB_CHECK_MONITOR([monitor modify only],
   [ordinal_schema], [OVSDB_MONITOR_INITIAL],
-  [ordinals], [ordinals], [OVSDB_MONITOR_TXNS],
+  [ordinals], [ordinals], [[[["ordinals",
+      {"op": "update",
+       "table": "ordinals",
+       "where": [["name", "==", "ten"]],
+       "row": {"name": "TEN"}}]]]],
   [[row,action,name,number,_version
-<0>,old,"""five""",,"[""uuid"",""<1>""]"
-,new,"""FIVE""",5,"[""uuid"",""<2>""]"
+<0>,old,"""ten""",,"[""uuid"",""<1>""]"
+,new,"""TEN""",10,"[""uuid"",""<2>""]"
 ]], [!initial,!insert,!delete])
-- 
2.1.4





More information about the dev mailing list