On 14 September 2016 at 09:00, Alin Serdean <aserd...@cloudbasesolutions.com > wrote:
> Windows allows '--detach' argument to be used. > This patch updates the ovsdb monitor tests to use it. > > Fixes hanging test: > 1889: monitor-cond-change > > Signed-off-by: Alin Gabriel Serdean <aserd...@cloudbasesolutions.com> > Can you have a look at the commit message of 90fd962877de which introduced the if else condition? Can you run the unit tests of the ovsdb-monitor a few times to make sure that there is no test failures because of the mentioned issue. > --- > tests/ovsdb-monitor.at | 28 +++++++++++----------------- > 1 file changed, 11 insertions(+), 17 deletions(-) > > diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at > index 6d51a1a..f809a2b 100644 > --- a/tests/ovsdb-monitor.at > +++ b/tests/ovsdb-monitor.at > @@ -27,14 +27,8 @@ m4_define([OVSDB_CHECK_MONITOR], > AT_CHECK([ovsdb-server --detach --no-chdir > --pidfile="`pwd`"/server-pid --remote=punix:socket > --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db > >/dev/null 2>&1], > [0], [], []) > AT_CAPTURE_FILE([ovsdb-client-log]) > - if test "$IS_WIN32" = "yes"; then > - AT_CHECK([ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid > --log-file="`pwd`"/ovsdb-client-log -d json monitor --format=csv > unix:socket $4 $5 $8 > output 2>/dev/null &], > - [0], [ignore], [ignore], [kill `cat server-pid`]) > - sleep 1 > - else > - AT_CHECK([ovsdb-client -vjsonrpc --detach --no-chdir > --pidfile="`pwd`"/client-pid --log-file="`pwd`"/ovsdb-client-log -d json > monitor --format=csv unix:socket $4 $5 $8 > output], > + AT_CHECK([ovsdb-client -vjsonrpc --detach --no-chdir > --pidfile="`pwd`"/client-pid --log-file="`pwd`"/ovsdb-client-log -d json > monitor --format=csv unix:socket $4 $5 $8 > output], > [0], [ignore], [ignore], [kill `cat server-pid`]) > - fi > m4_foreach([txn], [$6], > [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], > [ignore], [ignore], [kill `cat server-pid > client-pid`])]) > @@ -72,20 +66,20 @@ m4_define([OVSDB_CHECK_MONITOR_COND], > AT_CAPTURE_FILE([ovsdb-server-log]) > AT_CHECK([ovsdb-server --detach --no-chdir > --pidfile="`pwd`"/server-pid --remote=punix:socket > --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db > >/dev/null 2>&1], > [0], [], []) > - if test "$IS_WIN32" = "yes"; then > - AT_CHECK([ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d > json monitor-cond --format=csv unix:socket $4 '[$8]' $5 $9 > output &], > - [0], [ignore], [ignore], [kill `cat server-pid`]) > - sleep 1 > - else > - AT_CHECK([ ovsdb-client -vjsonrpc --detach --no-chdir > --pidfile="`pwd`"/client-pid -d json monitor-cond --format=csv unix:socket > $4 '[$8]' $5 $9 > output], > + AT_CHECK([ ovsdb-client -vjsonrpc --detach --no-chdir > --pidfile="`pwd`"/client-pid -d json monitor-cond --format=csv unix:socket > $4 '[$8]' $5 $9 > output], > [0], [ignore], [ignore], [kill `cat server-pid`]) > - fi > m4_foreach([txn], [$6], > [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], > [ignore], [ignore], [kill `cat server-pid > client-pid`])]) > - CLIENT_PID=`cat "$OVS_RUNDIR"/client-pid 2>/dev/null` > - m4_foreach([cond], [$10], > - [AT_CHECK([ovs-appctl -t "`pwd`"/ovsdb-client.$CLIENT_PID.ctl > ovsdb-client/cond_change $5 'cond'], [0], [ignore], [ignore])]) > + if test "$IS_WIN32" = "yes"; then > + : > + m4_foreach([cond], [$10], > + [AT_CHECK([ovs-appctl -t "`pwd`"/ovsdb-client.ctl > ovsdb-client/cond_change $5 'cond'], [0], [ignore], [ignore])]) > + else > + CLIENT_PID=`cat "$OVS_RUNDIR"/client-pid 2>/dev/null` > + m4_foreach([cond], [$10], > + [AT_CHECK([ovs-appctl -t "`pwd`"/ovsdb-client.$CLIENT_PID.ctl > ovsdb-client/cond_change $5 'cond'], [0], [ignore], [ignore])]) > + fi > AT_CHECK([ovsdb-client transact unix:socket '[["$4"]]'], [0], > [ignore], [ignore], [kill `cat server-pid client-pid`]) > AT_CHECK([ovs-appctl -t "`pwd`"/unixctl -e exit], [0], [ignore], > [ignore]) > -- > 2.9.2.windows.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
