Looks Good.
On Fri, Apr 1, 2011 at 3:46 PM, Ben Pfaff <b...@nicira.com> wrote:
> 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.
> ---
> 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 88499d0..b603cf7 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>"]}]
> --
> 1.7.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
