From: Ben Pfaff Date: Mon, 2 May 2011 19:52:56 +0000 (-0700) Subject: tests: Check ovs-openflowd log output instead of ignoring it. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35fe11834c85bf7fd86fa1a71f5415c2ca1d64d0;p=openvswitch tests: Check ovs-openflowd log output instead of ignoring it. ovs-openflowd outputs a number of log messages that we don't want to suppress. We do want to know if it logs anything that we don't expect. So this commit starts checking the log output, discarding any normal, expected messages. Reviewed-by: Simon Horman --- diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 06f9b65f..fabdb849 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -8,7 +8,13 @@ m4_define([OFPROTO_START], AT_CAPTURE_FILE([ovs-openflowd.log]) AT_CHECK( [ovs-openflowd --detach --pidfile --enable-dummy --log-file dummy@br0 none --datapath-id=fedcba9876543210 $1], - [0], [ignore], [ignore]) + [0], [], [stderr]) + AT_CHECK([[sed < stderr ' +/vlog|INFO|opened log file/d +/openflowd|INFO|Open vSwitch version/d +/openflowd|INFO|OpenFlow protocol version/d +/ofproto|INFO|using datapath ID/d +/ofproto|INFO|datapath ID changed to fedcba9876543210/d']]) ]) m4_define([OFPROTO_STOP],