Merge ~jocave/plainbox-provider-checkbox:always-cleanup-conns into plainbox-provider-checkbox:master

[Jonathan Cave]

During testing of lp:1765350 Ray noticed that connections were not being cleaned up anymore and hence devices were staying connected to the test APs. This should ensure the clean up is always run.

[Sheila Miguez (codersquid)]

In case the func will fail, maybe kept the 'try' and have the cleanup in the 'finally' clause.

[Jonathan Cave (jocave)]

This is what I did previously, but removed. I don't really get why. Was it just because of this sys.exit() move?

https://git.launchpad.net/plainbox-provider-checkbox/commit/bin/wifi_nmcli_test.py?id=7379c3755af212dd7926bb090f66a07e81e640db

[Sheila Miguez (codersquid)]

Maybe? But I think you'd want a try/finally clause regardless. It will be called on failures or successes. If you don't need to do anything for exceptions, you can leave out the except clause.

[Jonathan Cave (jocave)]

Yep, sorry for me questioning myself through an MR! Putting back the finally...

review: Needs Resubmitting

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/bin/wifi_nmcli_test.py b/bin/wifi_nmcli_test.py
index 5e5cb6e..71f01c9 100755
--- a/bin/wifi_nmcli_test.py
+++ b/bin/wifi_nmcli_test.py
@@ -221,7 +221,7 @@ if __name__ == '__main__':
     if args.func:
         try:
             result = args.func(args)
-        except:
+        finally:
             cleanup_nm_connections()
 
     # The test is not required to run as root, but root access is required for