Merge lp:~aisrael/charms/trusty/juju-gui/fix-automated-testing into lp:~juju-gui/charms/trusty/juju-gui/trunk

[Richard Harding]

Add test.yaml for automated tests.

[Francesco Banconi (frankban)]

Hi Adam,
thanks a lot for this branch, it looks nice, with just a minor request below.

Also note that lp:charms/juju-gui is the precise release branch of the GUI charm, while the development branch is lp:~juju-gui/charms/trusty/juju-gui/trunk, which is then pushed to both precise and trusty releases. Could you please repropose this against lp:~juju-gui/charms/trusty/juju-gui/trunk? I will take care of making charm releases later, so that we can test the GUI charm again with the bundletester.

review: Approve

[Richard Harding (rharding)]

I've retarged per Francesco's request using the resubmit proposal tool on the upper right. Francesco, can you double check all looks well and help walk it through the rest of the way please?

[Francesco Banconi (frankban)]

*** Submitted:

Add test.yaml for automated tests.

[Francesco Banconi (frankban)]

Thanks again Adam and Rick!
I merged the branch using "lbox submit -adopt".
I'll make a new charm release asap this week.

=== modified file 'config.yaml'
--- config.yaml	2014-04-15 14:17:12 +0000
+++ config.yaml	2014-10-13 06:18:03 +0000
@@ -66,17 +66,20 @@
       the GUI. Both ssl-cert-contents and ssl-key-contents must be provided.
       If not, cetificates will be automatically generated.
     type: string
+    default:
   ssl-key-contents:
     description: |
       The contents of the private key file to be used in SSL connections to
       the GUI. Both ssl-cert-contents and ssl-key-contents must be provided.
       If not, cetificates will be automatically generated.
     type: string
+    default:
   login-help:
     description: |
       The help text shown to the user on the login screen. If not provided, a
       default message is used, suggesting how to find the login credentials.
     type: string
+    default:
   read-only:
     description: |
       Whether or not the GUI is in read-only mode. Note that read-only mode is
@@ -103,6 +106,7 @@
       If given, the password to use for the environment to immediately
       connect.  Do not set unless you understand and accept the risks.
     type: string
+    default:
   sandbox:
     description: |
       Run using an in-memory sandbox rather than a real Juju backend. Sandbox
 
=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2014-10-13 06:18:03 +0000
@@ -0,0 +1,12 @@
+tests: "[0-9]*"
+reset: false
+packages:
+  - build-essential
+  - bzr
+  - charm-tools
+  - firefox
+  - libapt-pkg-dev
+  - libpython-dev
+  - python-virtualenv
+  - rsync
+  - xvfb