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

Proposed by Steve Langasek
Status: Merged
Merged at revision: 110
Proposed branch: lp://staging/~vorlon/ubuntu/xenial/juju/test-improvements
Merge into: lp://staging/~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta4
Diff against target: 31 lines (+3/-5)
2 files modified
debian/tests/manual-provider (+1/-0)
debian/tests/normal-user.sh (+2/-5)
To merge this branch: bzr merge lp://staging/~vorlon/ubuntu/xenial/juju/test-improvements
Reviewer Review Type Date Requested Status
Martin Packman Pending
Review via email: mp+292218@code.staging.launchpad.net

Description of the change

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)

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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

111. By Steve Langasek

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

112. By Steve Langasek

And make the manual provider's ssh key setup idempotent

Revision history for this message
Steve Langasek (vorlon) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches