Merge ~jocave/plainbox-provider-snappy:netplan-wireless-fixes into plainbox-provider-snappy:master

[Jonathan Cave]

It was spotted on some recent core18 beta test runs that there some tests were passed incorrectly.

This was because of the two bugs attached. A commit for each is included. Tested on an amd64 and rpi3 in the lab.

[Sylvain Pineau (sylvain-pineau)]

minor: raise SystemExit(1) is probably better/more readable (we know we exit with system exit status 1)

[Jonathan Cave (jocave)]

Agreed, swapped the empty strings for return code 1

[Sylvain Pineau (sylvain-pineau)]

Thanks, +1

review: Approve

diff --git a/bin/wifi_client_test_netplan.py b/bin/wifi_client_test_netplan.py
index c3c0345..c99c861 100755
--- a/bin/wifi_client_test_netplan.py
+++ b/bin/wifi_client_test_netplan.py
@@ -179,7 +179,12 @@ def delete_test_config():
 def netplan_apply_config():
     cmd = "netplan --debug apply"
     print_cmd(cmd)
-    retcode = sp.call(cmd, shell=True)
+    # Make sure the python env used by netplan is from the base snap
+    env = os.environ
+    env.pop('PYTHONHOME', None)
+    env.pop('PYTHONPATH', None)
+    env.pop('PYTHONUSERBASE', None)
+    retcode = sp.call(cmd, shell=True, env=env)
     if retcode != 0:
         print("ERROR: failed netplan apply call")
         return False
@@ -252,7 +257,7 @@ def main():
     if not netplan_apply_config():
         delete_test_config()
         netplan_config_restore()
-        raise SystemExit()
+        raise SystemExit(1)
     print()
     time.sleep(20)
 
@@ -271,7 +276,7 @@ def main():
         raise SystemExit("ERROR: failed to apply restored config")
 
     if not test_result:
-        raise SystemExit("")
+        raise SystemExit(1)
 
 
 if __name__ == "__main__":