'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 <[email protected]> --- tests/bridge.at | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/bridge.at b/tests/bridge.at index cc7619d..69bd80b 100644 --- a/tests/bridge.at +++ b/tests/bridge.at @@ -48,7 +48,7 @@ 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]) OVS_WAIT_UNTIL([test -e controller]) dnl Add the controller to both bridges, 5 seconds apart. @@ -77,4 +77,5 @@ AT_CHECK([ovs-vsctl --column=status list controller | dnl OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) OVS_APP_EXIT_AND_WAIT([ovsdb-server]) +on_exit 'kill `cat ovs-testcontroller.pid`' AT_CLEANUP -- 2.10.2.windows.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
