Merge lp:~elopio/snappy/sudo_path into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

Added a sudo wrapper that preserves the user path.

[lp:~elopio/snappy/sudo_path]

642. By Leo Arias on 2015-08-26

Make the file writable.

643. By Leo Arias on 2015-08-26

Fixed the path.

[Sergio Schvezov (sergiusens)]

Have you tried something like
Maybe expand PATH using os.ExpandEnv
cmd := exec.Command("/bin/sh", "-c", "sudo env PATH=$PATH ...")

review: Needs Information

[Leo Arias (elopio)]

That works. The problem with that approach is that we would have to do the same for every sudo call.
We could write a helper called ExecSudoCommand, if you prefer that.

[Sergio Schvezov (sergiusens)]

Oh, I'll leave it to your preference, we used to have run_with and run in phablet-test-run, made it easy to get it at a first glance.

I you prefer this, you have my ack to self approve though ;-)

[Leo Arias (elopio)]

I hate both ways. mvo found this, so maybe he'll have a preference.

[Leo Arias (elopio)]

Merged into https://code.launchpad.net/~mvo/snappy/lp1480248-test-reenable/+merge/269176

[Leo Arias (elopio)]

Wrong link. Merged into https://code.launchpad.net/~mvo/snappy/snappy-lp1488114-msg/+merge/269173

=== modified file '_integration-tests/reboot-wrapper'
--- _integration-tests/reboot-wrapper	2015-07-08 08:41:35 +0000
+++ _integration-tests/reboot-wrapper	2015-08-26 18:43:10 +0000
@@ -21,8 +21,19 @@
 TEST=$1
 NEEDS_REBOOT=/tmp/needs-reboot
 
+# We export the tests bin path so the snappy binary that might be compiled from
+# the branch is found.
 export PATH=$(pwd)/_integration-tests/bin:$PATH
 
+# XXX sudo does not preserve the user PATH. A nicer way to solve this would be
+# to use an alias, but go exec.Command sets the full binary path.
+cat > $(pwd)/_integration-tests/bin/sudo <<EOF
+#!/bin/bash
+/usr/bin/sudo env PATH=$PATH "\$@"
+EOF
+
+chmod +x $(pwd)/_integration-tests/bin/sudo
+
 # shift to remove the test binary name (first argument) and be able to pass the rest
 # of them to it
 shift