diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-04-01 15:46:22 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-04-01 15:46:22 -0700 |
| commit | d61113d99264e99e504d57706de2a84b2403fc52 (patch) | |
| tree | 52183bdf21c92362823139eeee23f0add88474e5 | |
| parent | aac19178a43f5ed3367e2d7a7a19ae34fdf56cfb (diff) | |
ovsdb-server: Avoid intermittent test failures due to lockfile log message.
Sometimes lockfile will emit a message saying that it took a little while
to get the lock, which caused spurious test failures. This commit
suppresses the message. With this change, I was able to run these tests
continuously for some time without failures.
This was a bug in the testsuite, not in the code under test.
| -rw-r--r-- | tests/ovsdb-server.at | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 88499d07..b603cf7d 100644 --- 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"}}]' ]]) -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. @@ -61,7 +61,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "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 @@ -75,7 +75,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "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>"]}] |