Thanks for the review, I made that change and pushed this series to master.
On 4 December 2014 at 11:23, Alex Wang <al...@nicira.com> wrote: > Since we stop the time, should we add a warp before calling > ovs-appctl netdev-dummy/receive ? > > Otherwise, looks good to me, > Acked-by: Alex Wang <al...@nicira.com> > > > On Wed, Dec 3, 2014 at 11:07 AM, Joe Stringer <joestrin...@nicira.com> > wrote: >> >> Occasionally, the testsuite would send the OFPT_SET_ASYNC before >> ovs-vswitchd got a chance to send its OFPT_ROLE_REPLY message, causing a >> reordering of the testsuite output and a false positive. Give the test >> script something extra to do so this is less likely to happen. >> >> Signed-off-by: Joe Stringer <joestrin...@nicira.com> >> --- >> tests/ofproto-dpif.at | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at >> index 9d3da4a..c63e003 100644 >> --- a/tests/ofproto-dpif.at >> +++ b/tests/ofproto-dpif.at >> @@ -2642,6 +2642,8 @@ OVS_VSWITCHD_START([dnl >> ]) >> ON_EXIT([kill `cat ovs-ofctl.pid`]) >> >> +ovs-appctl time/stop >> + >> AT_CAPTURE_FILE([ofctl_monitor.log]) >> # A table-miss flow has priority 0 and no match >> AT_CHECK([ovs-ofctl --protocols=OpenFlow13 add-flow br0 'priority=0 >> actions=output:CONTROLLER']) >> @@ -2652,6 +2654,9 @@ AT_CHECK([ovs-ofctl monitor -P openflow10 >> --protocols=OpenFlow13 br0 65534 --det >> # Become slave (OF 1.3), which should disable everything except port >> status. >> ovs-appctl -t ovs-ofctl ofctl/send >> 041800180000000200000003000000000000000000000001 >> >> +# Ensure that ovs-vswitchd gets a chance to reply before sending another >> command. >> +ovs-appctl time/warp 500 100 >> + >> # Use OF 1.3 OFPT_SET_ASYNC to enable OFPR_NO_MATCH for slave only. >> ovs-appctl -t ovs-ofctl ofctl/send >> 041c002000000002000000000000000100000000000000000000000000000000 >> >> -- >> 1.7.10.4 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
