git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-server: Avoid intermittent test failures due to lockfile log message.
[sliver-openvswitch.git]
/
tests
/
ovsdb-server.at
diff --git
a/tests/ovsdb-server.at
b/tests/ovsdb-server.at
index
88499d0
..
b603cf7
100644
(file)
--- a/
tests/ovsdb-server.at
+++ b/
tests/ovsdb-server.at
@@
-50,7
+50,7
@@
AT_DATA([txnfile], [[ovsdb-client transact unix:socket \
"table": "ordinals",
"row": {"number": 0, "name": "zero"}}]'
]])
"table": "ordinals",
"row": {"number": 0, "name": "zero"}}]'
]])
-AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [])
+AT_CHECK([ovsdb-server -
vlockfile:ANY:EMER -
-remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [])
cat stdout >> output
dnl Add some crap to the database log and run another transaction, which should
dnl ignore the crap and truncate it out of the log.
cat stdout >> output
dnl Add some crap to the database log and run another transaction, which should
dnl ignore the crap and truncate it out of the log.
@@
-61,7
+61,7
@@
AT_DATA([txnfile], [[ovsdb-client transact unix:socket \
"table": "ordinals",
"row": {"number": 1, "name": "one"}}]'
]])
"table": "ordinals",
"row": {"number": 1, "name": "one"}}]'
]])
-AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [stderr])
+AT_CHECK([ovsdb-server -
vlockfile:ANY:EMER -
-remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [stderr])
AT_CHECK([grep 'syntax error: db: parse error.* in header line "xxx"' stderr],
[0], [ignore])
cat stdout >> output
AT_CHECK([grep 'syntax error: db: parse error.* in header line "xxx"' stderr],
[0], [ignore])
cat stdout >> output
@@
-75,7
+75,7
@@
AT_DATA([txnfile], [[ovsdb-client transact unix:socket \
"where": [],
"sort": ["number"]}]'
]])
"where": [],
"sort": ["number"]}]'
]])
-AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [])
+AT_CHECK([ovsdb-server -
vlockfile:ANY:EMER -
-remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [])
cat stdout >> output
AT_CHECK([perl $srcdir/uuidfilt.pl output], [0],
[[[{"uuid":["uuid","<0>"]}]
cat stdout >> output
AT_CHECK([perl $srcdir/uuidfilt.pl output], [0],
[[[{"uuid":["uuid","<0>"]}]