Merge lp:~ibm-demo/charms/trusty/juju-gui/trunk into lp:charms/juju-gui

[Tim Van Steenburgh]

1. Update config.yaml to pass `charm proof`
2. Update tests.yaml so that tests are executed properly (and pass!) when run by the automated test runner. For more info on the automated test runner see: http://blog.juju.solutions/cloud/juju/2014/10/02/charm-testing.html

[Richard Harding (rharding)]

LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-04-15 14:17:12 +0000
+++ config.yaml	2014-10-29 19:39:45 +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
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2013-07-29 21:39:43 +0000
+++ metadata.yaml	2014-10-29 19:39:45 +0000
@@ -18,7 +18,7 @@
 summary: User interface for Juju (development)
 maintainer: Juju GUI Team <[e-mail]>
 description: Web GUI for Juju
-categories: ["applications"]
+tags: ["ops"]
 provides:
   web:
     interface: http
 
=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2014-10-29 19:39:45 +0000
@@ -0,0 +1,13 @@
+bootstrap: false
+reset: false
+tests: "none"
+packages:
+  - build-essential
+  - bzr
+  - libapt-pkg-dev
+  - libpython-dev
+  - python-virtualenv
+  - rsync
+  - xvfb
+  - charm-tools
+  - firefox