[ovs-dev] [PATCH v3 7/9] tests: Disable syslog for test utils.
Ilya Maximets
i.maximets at samsung.com
Wed Aug 8 12:35:38 UTC 2018
This disables syslog logging for:
* ovs-testcontroller
* test-netflow
* test-ovsdb
* test-sflow
* test-unixctl (for cases where it's not needed)
Signed-off-by: Ilya Maximets <i.maximets at samsung.com>
Acked-by: Aaron Conole <aconole at redhat.com>
---
tests/bridge.at | 3 ++-
tests/ofproto-dpif.at | 32 ++++++++++++++++++++++++--------
tests/ovsdb-idl.at | 29 +++++++++++++++++++++--------
tests/ovsdb.at | 2 +-
tests/vlog.at | 11 +++++++----
5 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/tests/bridge.at b/tests/bridge.at
index 1c36185..35fed02 100644
--- a/tests/bridge.at
+++ b/tests/bridge.at
@@ -48,7 +48,8 @@ OVS_VSWITCHD_START(
set bridge br1 datapath-type=dummy other-config:datapath-id=1234 ])
dnl Start ovs-testcontroller
-AT_CHECK([ovs-testcontroller --detach punix:controller --pidfile], [0], [ignore])
+AT_CHECK([ovs-testcontroller -vsyslog:off --detach punix:controller --pidfile],
+ [0], [ignore])
on_exit 'kill `cat ovs-testcontroller.pid`'
OVS_WAIT_UNTIL([test -e controller])
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index f0fca22..dd38d24 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -5991,7 +5991,9 @@ m4_define([CHECK_SFLOW_SAMPLING_PACKET],
OVS_VSWITCHD_START([set Bridge br0 fail-mode=standalone])
on_exit 'kill `cat test-sflow.pid`'
- AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:$1 > sflow.log], [0], [], [ignore])
+ AT_CHECK([ovstest test-sflow -vsyslog:off --log-file \
+ --detach --no-chdir --pidfile 0:$1 > sflow.log],
+ [0], [], [ignore])
AT_CAPTURE_FILE([sflow.log])
PARSE_LISTENING_PORT([test-sflow.log], [SFLOW_PORT])
ovs-appctl time/stop
@@ -6542,7 +6544,9 @@ OVS_VSWITCHD_START([dnl
other_config:lacp-aggregation-key=3333 ])
on_exit 'kill `cat test-sflow.pid`'
-AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log], [0], [], [ignore])
+AT_CHECK([ovstest test-sflow -vsyslog:off --log-file --detach --no-chdir \
+ --pidfile 0:127.0.0.1 > sflow.log],
+ [0], [], [ignore])
AT_CAPTURE_FILE([sflow.log])
PARSE_LISTENING_PORT([test-sflow.log], [SFLOW_PORT])
@@ -6586,7 +6590,9 @@ AT_XFAIL_IF([test "$IS_WIN32" = "yes"])
OVS_VSWITCHD_START([set Bridge br0 fail-mode=standalone])
dnl set up sFlow logging
-AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log], [0], [], [ignore])
+AT_CHECK([ovstest test-sflow -vsyslog:off --log-file --detach --no-chdir \
+ --pidfile 0:127.0.0.1 > sflow.log],
+ [0], [], [ignore])
AT_CAPTURE_FILE([sflow.log])
PARSE_LISTENING_PORT([test-sflow.log], [SFLOW_PORT])
ovs-appctl time/stop
@@ -6656,7 +6662,9 @@ AT_XFAIL_IF([test "$IS_WIN32" = "yes"])
OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 options:ifindex=1010])
dnl set up sFlow logging
-AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log], [0], [], [ignore])
+AT_CHECK([ovstest test-sflow -vsyslog:off --log-file --detach --no-chdir \
+ --pidfile 0:127.0.0.1 > sflow.log],
+ [0], [], [ignore])
AT_CAPTURE_FILE([sflow.log])
PARSE_LISTENING_PORT([test-sflow.log], [SFLOW_PORT])
ovs-appctl time/stop
@@ -6764,7 +6772,9 @@ table=0 dl_src=50:54:00:00:00:0b actions=pop_mpls:0x0800,2
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
dnl set up sFlow logging
-AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log], [0], [], [ignore])
+AT_CHECK([ovstest test-sflow -vsyslog:off --log-file --detach --no-chdir \
+ --pidfile 0:127.0.0.1 > sflow.log],
+ [0], [], [ignore])
AT_CAPTURE_FILE([sflow.log])
PARSE_LISTENING_PORT([test-sflow.log], [SFLOW_PORT])
ovs-appctl time/stop
@@ -6858,7 +6868,9 @@ m4_define([CHECK_NETFLOW_EXPIRATION],
ovs-appctl time/stop
on_exit 'kill `cat test-netflow.pid`'
- AT_CHECK([ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:$1 > netflow.log], [0], [], [ignore])
+ AT_CHECK([ovstest test-netflow -vsyslog:off --log-file --detach --no-chdir \
+ --pidfile 0:$1 > netflow.log],
+ [0], [], [ignore])
AT_CAPTURE_FILE([netflow.log])
PARSE_LISTENING_PORT([test-netflow.log], [NETFLOW_PORT])
@@ -6905,7 +6917,9 @@ m4_define([CHECK_NETFLOW_ACTIVE_EXPIRATION],
add_of_ports br0 1 2
on_exit 'kill `cat test-netflow.pid`'
- AT_CHECK([ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:$1 > netflow.log], [0], [], [ignore])
+ AT_CHECK([ovstest test-netflow -vsyslog:off --log-file --detach --no-chdir \
+ --pidfile 0:$1 > netflow.log],
+ [0], [], [ignore])
AT_CAPTURE_FILE([netflow.log])
PARSE_LISTENING_PORT([test-netflow.log], [NETFLOW_PORT])
@@ -8195,7 +8209,9 @@ m4_define([CHECK_MEGAFLOW_NETFLOW],
dnl NetFlow configuration disables wildcarding relevant fields
on_exit 'kill `cat test-netflow.pid`'
- AT_CHECK([ovstest test-netflow --log-file --detach --no-chdir --pidfile 0:$1 > netflow.log], [0], [], [ignore])
+ AT_CHECK([ovstest test-netflow -vsyslog:off --log-file --detach --no-chdir \
+ --pidfile 0:$1 > netflow.log],
+ [0], [], [ignore])
AT_CAPTURE_FILE([netflow.log])
PARSE_LISTENING_PORT([test-netflow.log], [NETFLOW_PORT])
ovs-vsctl \
diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at
index 487382a..3114c58 100644
--- a/tests/ovsdb-idl.at
+++ b/tests/ovsdb-idl.at
@@ -37,7 +37,8 @@ m4_define([OVSDB_CHECK_IDL_C],
AT_CHECK([ovsdb_start_idltest])
m4_if([$2], [], [],
[AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])])
- AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket $3],
+ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' \
+ -vjsonrpc -vsyslog:off -t10 idl unix:socket $3],
[0], [stdout], [ignore])
AT_CHECK([sort stdout | uuidfilt]m4_if([$6],,, [[| $6]]),
[0], [$4])
@@ -848,7 +849,8 @@ AT_KEYWORDS([ovsdb server idl positive])
# expects them to be there, so this test checks that it properly
# tolerates them being missing.
AT_CHECK([ovsdb_start_idltest "" "$abs_srcdir/idltest2.ovsschema"])
-AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket ['["idltest",
+AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' \
+ -vjsonrpc -vsyslog:off -t10 idl unix:socket ['["idltest",
{"op": "insert",
"table": "link1",
"row": {"i": 0, "k": ["named-uuid", "self"]},
@@ -1071,7 +1073,8 @@ m4_define([OVSDB_CHECK_IDL_TRACK_C],
AT_CHECK([ovsdb_start_idltest])
m4_if([$2], [], [],
[AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])])
- AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket $3],
+ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' \
+ -vjsonrpc -vsyslog:off -t10 -c idl unix:socket $3],
[0], [stdout], [ignore])
AT_CHECK([sort stdout | uuidfilt]m4_if([$6],,, [[| $6]]),
[0], [$4])
@@ -1200,7 +1203,9 @@ m4_define([OVSDB_CHECK_IDL_PARTIAL_UPDATE_MAP_COLUMN],
AT_CHECK([ovsdb_start_idltest])
m4_if([$2], [], [],
[AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])])
- AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-partial-update-map-column unix:socket $3],
+ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' \
+ -vjsonrpc -vsyslog:off -t10 \
+ -c idl-partial-update-map-column unix:socket $3],
[0], [stdout], [ignore])
AT_CHECK([sort stdout | uuidfilt]m4_if([$6],,, [[| $6]]),
[0], [$4])
@@ -1249,7 +1254,9 @@ m4_define([OVSDB_CHECK_IDL_PARTIAL_UPDATE_SET_COLUMN],
AT_CHECK([ovsdb_start_idltest])
m4_if([$2], [], [],
[AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])])
- AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-partial-update-set-column unix:socket $3],
+ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' \
+ -vjsonrpc -vsyslog:off -t10 \
+ -c idl-partial-update-set-column unix:socket $3],
[0], [stdout], [ignore])
AT_CHECK([sort stdout | uuidfilt]m4_if([$6],,, [[| $6]]),
[0], [$4])
@@ -1428,7 +1435,9 @@ m4_define([OVSDB_CHECK_IDL_COMPOUND_INDEX_SINGLE_COLUMN_C],
m4_if([$2], [], [],
[AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])])
# Generate the data to be tested.
- AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index unix:socket $3],
+ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' \
+ -vjsonrpc -vsyslog:off -t10 \
+ -c idl-compound-index unix:socket $3],
[0], [stdout], [ignore])
# Filter the rows of data that corresponds to the string index eliminating the extra columns of data.
# This is done to verifiy that the output data is in the correct and expected order.
@@ -1565,7 +1574,9 @@ m4_define([OVSDB_CHECK_IDL_COMPOUND_INDEX_DOUBLE_COLUMN_C],
m4_if([$2], [], [],
[AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])])
# Generate the data to be tested.
- AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index unix:socket $3],
+ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' \
+ -vjsonrpc -vsyslog:off -t10 \
+ -c idl-compound-index unix:socket $3],
[0], [stdout], [ignore])
# Filter the rows of data that corresponds to the string-integer index eliminating the extra columns of data.
# This is done to verifiy that the output data is in the correct and expected order.
@@ -1703,7 +1714,9 @@ m4_define([OVSDB_CHECK_IDL_COMPOUND_INDEX_WITH_REF],
AT_CHECK([ovsdb_start_idltest])
m4_if([$2], [], [],
[AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])])
- AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index-with-ref unix:socket $3],
+ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' \
+ -vjsonrpc -vsyslog:off -t10 \
+ -c idl-compound-index-with-ref unix:socket $3],
[0], [stdout], [ignore])
AT_CHECK([sort stdout | uuidfilt]m4_if([$6],,, [[| $6]]),
[0], [$4])
diff --git a/tests/ovsdb.at b/tests/ovsdb.at
index afe0a54..f2debe5 100644
--- a/tests/ovsdb.at
+++ b/tests/ovsdb.at
@@ -66,7 +66,7 @@ m4_define([OVSDB_CHECK_POSITIVE_CPY],
m4_define([OVSDB_CHECK_NEGATIVE],
[AT_SETUP([$1])
AT_KEYWORDS([ovsdb negative $4])
- AT_CHECK([test-ovsdb $2], [1], [], [stderr])
+ AT_CHECK([test-ovsdb -vsyslog:off $2], [1], [], [stderr])
m4_assert(m4_len([$3]))
AT_CHECK(
[if grep -F -e "AS_ESCAPE([$3])" stderr
diff --git a/tests/vlog.at b/tests/vlog.at
index bc03cf9..5af60bf 100644
--- a/tests/vlog.at
+++ b/tests/vlog.at
@@ -120,7 +120,8 @@ on_exit 'kill `cat test-unixctl.pid`'
AT_CAPTURE_FILE([log])
AT_CAPTURE_FILE([log.old])
-AT_CHECK([ovstest test-unixctl --log-file=`pwd`/log --pidfile --detach],
+AT_CHECK([ovstest test-unixctl -vsyslog:off \
+ --log-file=`pwd`/log --pidfile --detach],
[0], [], [stderr])
AT_CHECK([vlog_filt stderr], [0],
[opened log file
@@ -181,7 +182,7 @@ VLOG_REOPEN_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3])
AT_SETUP([vlog - vlog/reopen without log file - C])
on_exit 'kill `cat test-unixctl.pid`'
-AT_CHECK([ovstest test-unixctl --pidfile --detach])
+AT_CHECK([ovstest test-unixctl -vsyslog:off --pidfile --detach])
AT_CHECK([APPCTL -t test-unixctl vlog/reopen], [2], [],
[Logging to file not configured
@@ -214,7 +215,8 @@ AT_SKIP_IF([echo > /dev/full])
on_exit 'kill `cat test-unixctl.pid`'
-AT_CHECK([ovstest test-unixctl --log-file=`pwd`/log --pidfile --detach],
+AT_CHECK([ovstest test-unixctl -vsyslog:off \
+ --log-file=`pwd`/log --pidfile --detach],
[0], [], [stderr])
AT_CHECK([vlog_filt stderr], [0], [opened log file
])
@@ -280,7 +282,8 @@ on_exit 'kill `cat test-unixctl.pid`'
AT_CAPTURE_FILE([log])
AT_CAPTURE_FILE([log.old])
-AT_CHECK([ovstest test-unixctl --log-file=`pwd`/log --pidfile --detach],
+AT_CHECK([ovstest test-unixctl -vsyslog:off \
+ --log-file=`pwd`/log --pidfile --detach],
[0], [], [ignore])
AT_CHECK([vlog_filt log], [0], [opened log file
Entering run loop.
--
2.7.4
More information about the dev
mailing list