I expect Ethan to apply this, but I guess he lost track of it, so I've applied it now on his behalf.
On Thu, Feb 27, 2014 at 02:49:37PM +0900, YAMAMOTO Takashi wrote: > ping! > > >> Patch bf06c4fe (tests/ofproto-dpif.at: Workaround a race.), fixed a > >> race condition which patch 0a8763f (ofproto-dpif-upcall: Hardcode > >> max_idle to 1500ms.) unfixed. > >> > >> Signed-off-by: Ethan Jackson <et...@nicira.com> > >> Reported-by: YAMAMOTO Takashi <yamam...@valinux.co.jp> > > > > looks good to me. > > > > YAMAMOTO Takashi > > > >> --- > >> tests/ofproto-dpif.at | 6 ++++++ > >> 1 file changed, 6 insertions(+) > >> > >> diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at > >> index 1348790..7560f2a 100644 > >> --- a/tests/ofproto-dpif.at > >> +++ b/tests/ofproto-dpif.at > >> @@ -2442,10 +2442,16 @@ AT_CHECK([ovs-ofctl add-flow br1 > >> actions=LOCAL,output:1,output:3]) > >> > >> for i in $(seq 1 10); do > >> ovs-appctl netdev-dummy/receive br0 > >> 'in_port(100),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' > >> + if [[ $i -eq 1 ]]; then > >> + sleep 1 > >> + fi > >> done > >> > >> for i in $(seq 1 5); do > >> ovs-appctl netdev-dummy/receive br1 > >> 'in_port(101),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' > >> + if [[ $i -eq 1 ]]; then > >> + sleep 1 > >> + fi > >> done > >> > >> AT_CHECK([ovs-appctl time/warp 500], [0], > >> -- > >> 1.8.1.2 > >> > >> _______________________________________________ > >> dev mailing list > >> dev@openvswitch.org > >> http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > http://openvswitch.org/mailman/listinfo/dev > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
