[ovs-dev] [PATCH] tests: Fixed ovsdb-monitor tests

Guru Shetty guru at ovn.org
Fri Jun 24 18:50:35 UTC 2016


On 24 June 2016 at 09:51, Paul Boca <pboca at cloudbasesolutions.com> wrote:

> Redirect ovsdb-client stderr to /dev/null.
> This fixes the series of tests:1770 1771 1772 1773 1774 1775 1776 1777
> 1778 1779 1780
>
> Signed-off-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
> ---
>  tests/ovsdb-monitor.at | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at
> index 0649f2a..03690ba 100644
> --- a/tests/ovsdb-monitor.at
> +++ b/tests/ovsdb-monitor.at
> @@ -26,12 +26,13 @@ m4_define([OVSDB_CHECK_MONITOR],
>     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], [], [])
> +   AT_CAPTURE_FILE([ovsdb-client-log])
>     if test "$IS_WIN32" = "yes"; then
> -     AT_CHECK([ovsdb-client -vjsonrpc --pidfile="`pwd`"/client-pid -d
> json monitor --format=csv unix:socket $4 $5 $8 > output &],
> +     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 &],
>

Is the addition of --log-file an unrelated change? Or was it required to
fix the tests somehow?

>                [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 --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],
> --
> 2.7.2.windows.1
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>



More information about the dev mailing list