test-unixctl.py and test-vlog.py outputs on stderr and on Windows
stderr is not overriden by every AT_CHECK call, the logs are only
apended to the file and subsequent AT_CHECKs get errors from previous
call.
Signed-off-by: Paul-Daniel Boca <pb...@cloudbasesolutions.com>
---
tests/unixctl-py.at | 3 ++-
tests/vlog.at | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at
index 2031897..0ed3c41 100644
--- a/tests/unixctl-py.at
+++ b/tests/unixctl-py.at
@@ -114,7 +114,8 @@ m4_define([UNIXCTL_SERVER_PYN],
AT_SKIP_IF([test $2 = no])
on_exit 'kill `cat test-unixctl.py.pid`'
AT_CAPTURE_FILE([`pwd`/test-unixctl.py.log])
- AT_CHECK([$3 $srcdir/test-unixctl.py --log-file --pidfile --detach])
+ AT_CHECK([$3 $srcdir/test-unixctl.py --log-file --pidfile --detach],
+ [0], [], [ignore])
AT_CHECK([APPCTL -t test-unixctl.py help], [0], [stdout])
AT_CHECK([cat stdout], [0], [dnl
diff --git a/tests/vlog.at b/tests/vlog.at
index a689809..468e872 100644
--- a/tests/vlog.at
+++ b/tests/vlog.at
@@ -195,7 +195,7 @@ m4_define([VLOG_REOPEN_WITHOUT_FILE_PYN],
AT_SKIP_IF([test $2 = no])
on_exit 'kill `cat test-unixctl.py.pid`'
- AT_CHECK([$3 $srcdir/test-unixctl.py --pidfile --detach])
+ AT_CHECK([$3 $srcdir/test-unixctl.py --pidfile --detach], [0], [], [ignore])
AT_CHECK([APPCTL -t test-unixctl.py vlog/reopen], [0],
[Logging to file not configured
@@ -322,7 +322,7 @@ m4_define([VLOG_CLOSE_PYN],
AT_CAPTURE_FILE([log])
AT_CAPTURE_FILE([log.old])
- AT_CHECK([$3 $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile
--detach])
+ AT_CHECK([$3 $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile
--detach 2>/dev/null])
AT_CHECK([APPCTL -t test-unixctl.py log message])
AT_CHECK([APPCTL -t test-unixctl.py log message2])
@@ -406,7 +406,8 @@ m4_define([VLOG_SET_AND_LIST_PYN],
on_exit 'kill `cat test-unixctl.py.pid`'
AT_CAPTURE_FILE([log])
- AT_CHECK([$3 $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile
--detach])
+ AT_CHECK([$3 $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile \
+ --detach 2>/dev/null])
AT_CHECK([APPCTL -t test-unixctl.py vlog/list], [0], [dnl
console syslog file
@@ -502,7 +503,7 @@ m4_define([VLOG_RFC5424_PYN],
])
AT_CHECK([$3 $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile \
--vFACILITY:daemon --detach])
+-vFACILITY:daemon --detach], [0], [], [ignore])
AT_CHECK([ovs-appctl -t test-unixctl.py vlog/set FACILITY:invalid], [0],
[Facility invalid is invalid
--
2.7.2.windows.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
