| Message ID | 1472222398-5780-12-git-send-email-pboca@cloudbasesolutions.com |
|---|---|
| State | Superseded |
| Delegated to: | Guru Shetty |
| Headers | show |
On 26 August 2016 at 07:40, Paul Boca <pboca@cloudbasesolutions.com> wrote: > The ovsdb-client doesn't suport detach and listening on a local port > on Windows. > The --detach switch is ignored. > This looks like a non-Python related test. This used to work before. Is it that something changed recently that you are skipping this? Can you explain more? > > Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> > --- > tests/ovsdb-monitor.at | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at > index 6d51a1a..933b844 100644 > --- a/tests/ovsdb-monitor.at > +++ b/tests/ovsdb-monitor.at > @@ -64,6 +64,7 @@ m4_define([OVSDB_CHECK_MONITOR], > # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. > m4_define([OVSDB_CHECK_MONITOR_COND], > [AT_SETUP([$1]) > + AT_SKIP_IF([test "$IS_WIN32" = "yes"]) > AT_KEYWORDS([ovsdb server monitor monitor-cond positive $10]) > $2 > schema > AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) > @@ -72,14 +73,8 @@ 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], > - [0], [ignore], [ignore], [kill `cat server-pid`]) > - fi > + 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`]) > m4_foreach([txn], [$6], > [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], > [ignore], [ignore], [kill `cat server-pid > client-pid`])]) > -- > 2.7.2.windows.1 > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev >
diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at index 6d51a1a..933b844 100644 --- a/tests/ovsdb-monitor.at +++ b/tests/ovsdb-monitor.at @@ -64,6 +64,7 @@ m4_define([OVSDB_CHECK_MONITOR], # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_MONITOR_COND], [AT_SETUP([$1]) + AT_SKIP_IF([test "$IS_WIN32" = "yes"]) AT_KEYWORDS([ovsdb server monitor monitor-cond positive $10]) $2 > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) @@ -72,14 +73,8 @@ 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], - [0], [ignore], [ignore], [kill `cat server-pid`]) - fi + 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`]) m4_foreach([txn], [$6], [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], [ignore], [ignore], [kill `cat server-pid client-pid`])])
The ovsdb-client doesn't suport detach and listening on a local port on Windows. The --detach switch is ignored. Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> --- tests/ovsdb-monitor.at | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)