summaryrefslogtreecommitdiff
path: root/tests/ovsdb-cluster.at
diff options
context:
space:
mode:
authorDumitru Ceara <dceara@redhat.com>2021-03-24 10:33:08 +0100
committerIlya Maximets <i.maximets@ovn.org>2021-04-01 13:53:20 +0200
commit4c0d093b17e8610e92891abad879484b7fbbd716 (patch)
tree8fb2a215e6ab892b548cbb701a80e656f6a26531 /tests/ovsdb-cluster.at
parent31629b5383c3ce2d3ca63377deade28498bb8a1b (diff)
downloadopenvswitch-4c0d093b17e8610e92891abad879484b7fbbd716.tar.gz
ovsdb-idl.at: Make test outputs more predictable.
IDL tests need predictable output from test-ovsdb. This used to be done by first sorting the output of test-ovsdb and then applying uuidfilt to predictably translate UUIDs. This was not reliable enough in case test-ovsdb processes two or more insert/delete operations in the same iteration because the order of lines in the output depends on the automatically generated UUID values. To fix this we change the way test-ovsdb and test-ovsdb.py generate outputs and prepend the table name and tracking information before printing the contents of a row. All existing ovsdb-idl.at and ovsdb-cluster.at tests are updated to expect the new output format. Signed-off-by: Dumitru Ceara <dceara@redhat.com> Acked-by: Han Zhou <hzhou@ovn.org> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
Diffstat (limited to 'tests/ovsdb-cluster.at')
-rw-r--r--tests/ovsdb-cluster.at2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ovsdb-cluster.at b/tests/ovsdb-cluster.at
index 92aa42709..cf43e9cf8 100644
--- a/tests/ovsdb-cluster.at
+++ b/tests/ovsdb-cluster.at
@@ -128,7 +128,7 @@ ovsdb_test_cluster_disconnect () {
"rows": [{"i": 1}]}]]' > test-ovsdb.log 2>&1 &
echo $! > test-ovsdb.pid
- OVS_WAIT_UNTIL([grep "000: i=1" test-ovsdb.log])
+ OVS_WAIT_UNTIL([grep "000: table simple: i=1" test-ovsdb.log])
# Start collecting raft_is_connected logs for $target before shutting down
# any servers.