Merge lp://qastaging/~frankban/charms/precise/juju-gui/ftests-bootstrap-node into lp://qastaging/~juju-gui/charms/precise/juju-gui/trunk

Reviewers: mp+196954_code.launchpad.net,

Message:
Please take a look.

Description:
Deploy the GUI to machine 0 in functional tests.

Also added guiserver info checks, and fixed the
deploy module so that the previous behavior of
"make deploy" is restored and the resulting
service name is not random generated.

Removed test_local_release: that scenario is
already tested in TestBuiltinServerLocalRelease.

Moved test_nrpe_check_available to
TestBuiltinServerLocalRelease.

Tests: assuming ec2 is the name of your ec2
environment, run the following:
`time make ftest JUJU_ENV="ec2"`
Tests should pass and take ~25-30 minutes.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/ftests-bootstrap-node/+merge/196954

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/34130043/

Affected files (+141, -108 lines):
   M Makefile
   A [revision details]
   M revision
   M tests/20-functional.test
   M tests/deploy.py
   M tests/example.py
   M tests/helpers.py
   M tests/test_deploy.py

LGTM with trivial. Thank you!

https://codereview.appspot.com/34130043/diff/1/tests/20-functional.test
File tests/20-functional.test (right):

https://codereview.appspot.com/34130043/diff/1/tests/20-functional.test#newcode58
tests/20-functional.test:58: Deploy the charm in the bootstrap node if
possible in the current Juju
Suggest slight tweak for readability:

Deploy the charm, using the bootstrap node if the current Juju
implementation supports it.

https://codereview.appspot.com/34130043/

Code LGTMly, was not able to QA due to unrelated failures; can someone
else QA please?

https://codereview.appspot.com/34130043/

Francesco, under the circumstances, I suggest that you either run the
test on another computer or in another virtual machine or something,
and then land it; or just land it. :-)

> On Nov 27, 2013, at 10:24 PM, Matthew Scott <email address hidden> wrote:
>
> Code LGTMly, was not able to QA due to unrelated failures; can someone
> else QA please?
>
> https://codereview.appspot.com/34130043/
>
> --
> https://code.launchpad.net/~frankban/charms/precise/juju-gui/ftests-bootstrap-node/+merge/196954
> Your team Juju GUI Hackers is subscribed to branch lp:~juju-gui/charms/precise/juju-gui/trunk.

QA OK

real 23m39.657s

https://codereview.appspot.com/34130043/

*** Submitted:

Deploy the GUI to machine 0 in functional tests.

Also added guiserver info checks, and fixed the
deploy module so that the previous behavior of
"make deploy" is restored and the resulting
service name is not random generated.

Removed test_local_release: that scenario is
already tested in TestBuiltinServerLocalRelease.

Moved test_nrpe_check_available to
TestBuiltinServerLocalRelease.

Tests: assuming ec2 is the name of your ec2
environment, run the following:
`time make ftest JUJU_ENV="ec2"`
Tests should pass and take ~25-30 minutes.

R=gary.poster, matthew.scott, jeff.pihach
CC=
https://codereview.appspot.com/34130043

https://codereview.appspot.com/34130043/

Thank you!

https://codereview.appspot.com/34130043/