On Fri, Jan 25, 2013 at 05:43:27PM -0800, Justin Pettit wrote: > I'm going to backport it to branch-1.9. I had to make the following change > for the unit test: > > -=-=-=-=-=-=-=-=-=- > diff --git a/tests/learn.at b/tests/learn.at > index 305d2f8..868a4b5 100644 > --- a/tests/learn.at > +++ b/tests/learn.at > @@ -120,9 +120,9 @@ dnl it gets re-learned again the next time a packet > appears, > dnl sometimes the expiration can cause temporary flooding etc.) > AT_SETUP([learning action - learn refreshes hard_age]) > OVS_VSWITCHD_START( > - [add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \ > - add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2 -- \ > - add-port br0 p3 -- set Interface p3 type=dummy ofport_request=3]) > + [add-port br0 p1 -- set Interface p1 type=dummy -- \ > + add-port br0 p2 -- set Interface p2 type=dummy -- \ > + add-port br0 p3 -- set Interface p3 type=dummy]) > > ovs-appctl time/stop > > @@ -138,7 +138,7 @@ > flow="in_port(3),eth(src=50:54:00:00:00:07,dst=50:54:00:00:0 > AT_CHECK([ovs-appctl ofproto/trace br0 "$flow" -generate], [0], [stdout]) > actual=`tail -1 stdout | sed 's/Datapath actions: //'` > > -expected="1,2,100" > +expected="0,1,2" > AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout]) > mv stdout expout > AT_CHECK([ovs-dpctl normalize-actions "$flow" "$actual"], [0], [expout]) > -=-=-=-=-=-=-=-=-=- > > Does that look reasonable to you? If so, I'll push it.
Yeah, that's fine. I think it'd also be fine to omit the test for backporting purposes, since it's really to avoid further regression and we don't expect much change on branch-1.x. _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
