X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fofproto-macros.at;h=3bcffc252c3cade56061cb9f2be8cccd81cc5744;hb=1e827902be9194d71ea851c9ce2676f65eeed33a;hp=d034105daaabf43346a23343a53b95526eae23c6;hpb=85606e05b691be7c2f2d4bcf0e91170b71ec8fbb;p=sliver-openvswitch.git diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index d034105da..3bcffc252 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -83,12 +83,16 @@ m4_define([OVS_VSWITCHD_START], /ofproto|INFO|datapath ID changed to fedcba9876543210/d']]) dnl Add bridges, ports, etc. - AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[[OpenFlow10,OpenFlow12,OpenFlow13]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) + AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) ]) m4_divert_push([PREPARE_TESTS]) check_logs () { sed -n "$1 +/timeval.*Unreasonably long [[0-9]]*ms poll interval/d +/timeval.*faults: [[0-9]]* minor, [[0-9]]* major/d +/timeval.*disk: [[0-9]]* reads, [[0-9]]* writes/d +/timeval.*context switches: [[0-9]]* voluntary, [[0-9]]* involuntary/d /|WARN|/p /|ERR|/p /|EMER|/p" ovs-vswitchd.log ovsdb-server.log