[ovs-dev] [PATCH] Tests: Fix testing bridge - add port after stopping controller on Windows

aserdean at ovn.org aserdean at ovn.org
Thu Nov 15 13:32:32 UTC 2018


Applied on master, branch-2.10, branch-2.9.

--
Alin.

> -----Mesaj original-----
> De la: ovs-dev-bounces at openvswitch.org <ovs-dev-
> bounces at openvswitch.org> În numele aserdean at ovn.org
> Trimis: Thursday, November 15, 2018 3:23 PM
> Către: 'Sairam Venugopal' <vsairam at vmware.com>; 'Alin Gabriel Serdean'
> <aserdean at ovn.org>; dev at openvswitch.org
> Subiect: Re: [ovs-dev] [PATCH] Tests: Fix testing bridge - add port after
> stopping controller on Windows
> 
> I have opened an issue for it: https://github.com/openvswitch/ovs-
> issues/issues/165
> 
> It's not test specific unfortunately. The file is put up for unlink on exit, but I'm
> guessing someone still has an opened handle at that point.
> 
> I'm applying this patch for the moment and following up with the actual fix
> for the userspace.
> 
> Thanks for the ack.
> 
> Alin.
> 
> > -----Mesaj original-----
> > De la: ovs-dev-bounces at openvswitch.org <ovs-dev-
> > bounces at openvswitch.org> În numele Sairam Venugopal
> > Trimis: Wednesday, November 14, 2018 10:19 PM
> > Către: Alin Gabriel Serdean <aserdean at ovn.org>; dev at openvswitch.org
> > Subiect: Re: [ovs-dev] [PATCH] Tests: Fix testing bridge - add port
> > after stopping controller on Windows
> >
> > Thanks for fixing this. The files normally get deleted when the agent
> > closes. Is this a regression or just test related? Ack'ing the fix.
> >
> > Acked-by: Sairam Venugopal <vsairam at vmware.com>
> >
> > On 11/14/18, 7:31 AM, "ovs-dev-bounces at openvswitch.org on behalf of
> > Alin Gabriel Serdean" <ovs-dev-bounces at openvswitch.org on behalf of
> > aserdean at ovn.org> wrote:
> >
> >     On Windows the file which is used for the named pipe connection
> > (`punix:file`)
> >     is not deleted when the process is closed.
> >
> >     Try to delete the `controller` file and fail if we can't (on Windows you
> can't
> >     delete a file if there still an opened handle to it).
> >
> >     Also add a check to see if the `ovs-testcontroller` was successfully
> started.
> >
> >     Signed-off-by: Alin Gabriel Serdean <aserdean at ovn.org>
> >     ---
> >      tests/bridge.at | 5 ++++-
> >      1 file changed, 4 insertions(+), 1 deletion(-)
> >
> >     diff --git a/tests/bridge.at b/tests/bridge.at
> >     index ee398bdb1..b94afc194 100644
> >     --- a/tests/bridge.at
> >     +++ b/tests/bridge.at
> >     @@ -84,7 +84,7 @@ AT_SETUP([bridge - add port after stopping
> > controller])
> >      OVS_VSWITCHD_START
> >
> >      dnl Start ovs-testcontroller
> >     -ovs-testcontroller --detach punix:controller --pidfile=ovs-
> > testcontroller.pid
> >     +AT_CHECK([ovs-testcontroller --detach punix:controller
> > --pidfile], [0],
> > [ignore])
> >      OVS_WAIT_UNTIL([test -e controller])
> >
> >      AT_CHECK([ovs-vsctl set-controller br0 unix:controller])
> >     @@ -93,6 +93,9 @@ AT_CHECK([ovs-appctl -t ovs-vswitchd version],
> > [0],
> > [ignore])
> >
> >      # Now kill the ovs-testcontroller
> >      kill `cat ovs-testcontroller.pid`
> >     +if test "$IS_WIN32" = "yes"; then
> >     +    AT_CHECK([rm controller], [0], [ignore])
> >     +fi
> >      OVS_WAIT_UNTIL([! test -e controller])
> >      AT_CHECK([ovs-vsctl --no-wait add-port br0 p2 -- set Interface p2
> > type=internal], [0], [ignore])
> >      AT_CHECK([ovs-appctl -t ovs-vswitchd version], [0], [ignore])
> >     --
> >     2.16.1.windows.1
> >
> >     _______________________________________________
> >     dev mailing list
> >     dev at openvswitch.org
> >
> > https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmail.
> > o
> > penvswitch.org%2Fmailman%2Flistinfo%2Fovs-
> >
> dev&amp;data=02%7C01%7Cvsairam%40vmware.com%7C074d45f6e70d4431
> >
> f7a708d64a4639a6%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C1%7C0%7C6
> >
> 36778062866824077&amp;sdata=EPht5myv2MmYwaY49hSYegAfewIVjkbvNC
> > Tf5YBsYJM%3D&amp;reserved=0
> >
> >
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev



More information about the dev mailing list