Merge lp:~vorlon/ubuntu/xenial/juju/test-improvements into lp:~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta4

[Steve Langasek]

Minor adjustments to test runners to make them less fussy about the environment, so you can repeat tests without having to tear down the testbed (useful for debugging)

[Michael Hudson-Doyle (mwhudson)]

I think this breaks the manual provider tests because the jujutest user now has /bin/false for a shell.

[lp:~vorlon/ubuntu/xenial/juju/test-improvements]

111. By Steve Langasek on 2016-04-19

make sure jujutest still gets a valid shell, so that ssh works

112. By Steve Langasek on 2016-04-19

And make the manual provider's ssh key setup idempotent

[Steve Langasek (vorlon)]

On Tue, Apr 19, 2016 at 03:54:16AM -0000, Michael Hudson-Doyle wrote:
> I think this breaks the manual provider tests because the jujutest user now has /bin/false for a shell.

Hmm, indeed. Pushed a couple of further fixes.

=== modified file 'debian/tests/manual-provider'
--- debian/tests/manual-provider	2016-03-22 16:27:15 +0000
+++ debian/tests/manual-provider	2016-04-19 06:40:01 +0000
@@ -9,6 +9,7 @@
 ip=`ip -o -4 addr show|awk '{print $4}'|cut -f1 -d/|grep -v '^127.0.0.1$'|head -1`
 
 mkdir -pm700 ~/.ssh
+rm -f ~/.ssh/id_rsa ~/.ssh/id_rsa.pub
 ssh-keygen -f ~/.ssh/id_rsa -N ''
 cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
 ssh-keyscan "$ip" >> ~/.ssh/known_hosts

=== modified file 'debian/tests/normal-user.sh'
--- debian/tests/normal-user.sh	2016-04-14 22:49:27 +0000
+++ debian/tests/normal-user.sh	2016-04-19 06:40:01 +0000
@@ -9,13 +9,10 @@
 
 # Author: Robie Basak <[e-mail]>
 
-adduser --disabled-password --gecos '' jujutest
+adduser --system --shell /bin/sh --disabled-password --gecos '' jujutest
 adduser jujutest lxd || true
 
 # Allow jujutest to sudo back to root (this is what juju expects)
 echo 'jujutest ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/jujutest
 
-sudo -iu jujutest sh <<EOT
-cd "$PWD"
-$@
-EOT
+su jujutest -l -c "cd '$PWD'; $@"