Commit ebed9f78(ovsdb-server: Improve message for "add-db" of database already open.) improved the error message seen when opening an already opened database on Linux. For Windows, we still need to look for the lockfile error message.
Signed-off-by: Gurucharan Shetty <gshe...@nicira.com> --- tests/ovsdb-server.at | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 464c3bf..32d0f2a 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -194,10 +194,17 @@ AT_CHECK([ovsdb-client list-tables unix:socket constraints], [0], [ignore], [ign AT_CHECK([ovsdb-client list-tables unix:socket ordinals], [0], [ignore], [ignore]) # Add an already added database. -AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db2], 2, [], +if test $IS_WIN32 = "yes"; then + AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db2], 2, [], + [I/O error: db2: failed to lock lockfile (Resource deadlock avoided) +ovs-appctl: ovsdb-server: server returned an error +]) +else + AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db2], 2, [], [db2: already open ovs-appctl: ovsdb-server: server returned an error ]) +fi # Add a non-existing database. AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db3], 2, [], [stderr]) -- 1.7.9.5 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
