tests: Check ovs-openflowd log output instead of ignoring it.
authorBen Pfaff <blp@nicira.com>
Mon, 2 May 2011 19:52:56 +0000 (12:52 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 13 May 2011 21:45:53 +0000 (14:45 -0700)
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 <horms@verge.net.au>
tests/ofproto-macros.at

index 06f9b65f698fcdf059322efbcb532a24427a9d6c..fabdb849ba64131610ce922d6a6014f1c656af82 100644 (file)
@@ -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],