| Message ID | 20170523140506.14904-1-aserdean@cloudbasesolutions.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, May 23, 2017 at 7:05 AM, Alin Serdean <aserdean@cloudbasesolutions.com> wrote: > From: Alin Serdean <aserdean@cloudbasesolutions.com> > > 'multiple bridges share a controller' hangs on windows because it is > lacking the exit information (it will hang when the test has finished) > > Introduce a pidfile to 'ovs-testcontroller' and end it on exit based on > the pidfile. > > Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Thanks Alin for the fix and Joe for the review. It looks good to me. Acked-by: Andy Zhou <azhou@ovn.org> I will push it in a few minutes. > --- > v2: move 'on_exit' after 'ovs-testcontroller' creation (Joe Stringer) > --- > tests/bridge.at | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/bridge.at b/tests/bridge.at > index cc7619d..f6c2327 100644 > --- a/tests/bridge.at > +++ b/tests/bridge.at > @@ -48,7 +48,8 @@ OVS_VSWITCHD_START( > set bridge br1 datapath-type=dummy other-config:datapath-id=1234 ]) > > dnl Start ovs-testcontroller > -AT_CHECK([ovs-testcontroller --detach punix:controller], [0], [ignore]) > +AT_CHECK([ovs-testcontroller --detach punix:controller --pidfile], [0], [ignore]) > +on_exit 'kill `cat ovs-testcontroller.pid`' > OVS_WAIT_UNTIL([test -e controller]) > > dnl Add the controller to both bridges, 5 seconds apart. > -- > 2.10.2.windows.1 > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff --git a/tests/bridge.at b/tests/bridge.at index cc7619d..f6c2327 100644 --- a/tests/bridge.at +++ b/tests/bridge.at @@ -48,7 +48,8 @@ OVS_VSWITCHD_START( set bridge br1 datapath-type=dummy other-config:datapath-id=1234 ]) dnl Start ovs-testcontroller -AT_CHECK([ovs-testcontroller --detach punix:controller], [0], [ignore]) +AT_CHECK([ovs-testcontroller --detach punix:controller --pidfile], [0], [ignore]) +on_exit 'kill `cat ovs-testcontroller.pid`' OVS_WAIT_UNTIL([test -e controller]) dnl Add the controller to both bridges, 5 seconds apart.