Merge lp:~tvansteenburgh/charm-tools/lp-1277652 into lp:charm-tools/1.2

[Tim Van Steenburgh]

  Change handling of missing default values for config options.

  New behavior is as follows:

  - If the default KEY is missing, that is a Warning for all data types.
  - If the default VALUE is missing, that is a Warning for booleans and
    Info for all other data types.

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-01-10 20:01:51 +0000
+++ Makefile	2014-05-16 15:55:55 +0000
@@ -89,13 +89,13 @@
 
 integration:
 	tests_functional/helpers/helpers.sh || sh -x tests_functional/helpers/helpers.sh timeout
-	@echo Test shell helpers with dash
-	bash tests/helpers/helpers.sh \
-	    || bash -x tests/helpers/helpers.sh timeout
-	tests/helpers/helpers.bash || sh -x tests/helpers/helpers.bash timeout
-	@echo Test shell helpers with bash
-	bash tests/helpers/helpers.bash \
-	    || bash -x tests/helpers/helpers.bash timeout
+	@echo Test shell helpers with bash
+	bash tests_functional/helpers/helpers.sh \
+	    || bash -x tests_functional/helpers/helpers.sh timeout
+	tests_functional/helpers/helpers.bash || sh -x tests_functional/helpers/helpers.bash timeout
+	@echo Test shell helpers with bash
+	bash tests_functional/helpers/helpers.bash \
+	    || bash -x tests_functional/helpers/helpers.bash timeout
 	@echo Test charm proof
 	tests_functional/proof/test.sh
 	tests_functional/create/test.sh

=== modified file 'charmtools/charms.py'
--- charmtools/charms.py	2014-04-30 19:27:07 +0000
+++ charmtools/charms.py	2014-05-16 15:55:55 +0000
@@ -42,6 +42,8 @@
     'boolean': bool,
 }
 
+ALLOW_NONE_DEFAULT = (basestring, int, float)
+
 
 class RelationError(Exception):
     pass
@@ -184,12 +186,19 @@
                           % (option_name, option_type))
             elif 'default' in option_value:
                 expected_type = KNOWN_OPTION_TYPES[option_value['type']]
-                if not isinstance(option_value['default'], expected_type):
+                actual_value = option_value['default']
+                if actual_value is None:
+                    notify = (self.info if expected_type in ALLOW_NONE_DEFAULT
+                              else self.warn)
+                    notify(
+                        'config.yaml: option %s has no default value'
+                        % option_name)
+                elif not isinstance(actual_value, expected_type):
                     self.err(
                         'config.yaml: type of option %s is specified as '
                         '%s, but the type of the default value is %s'
                         % (option_name, option_value['type'],
-                           type(option_value['default']).__name__))
+                           type(actual_value).__name__))
             else:
                 # Nothing to do: the option type is valid but no default
                 # value exists.
@@ -205,7 +214,7 @@
     def is_charm(self):
         return os.path.isfile(os.path.join(self.charm_path, 'metadata.yaml'))
 
-    def proof(self, remote=True):
+    def proof(self, remote=True, **kw):
         lint = CharmLinter()
         charm_name = self.charm_path
         if os.path.isdir(charm_name):
@@ -326,8 +335,8 @@
                                         continue
                                     lc += 1
                                     if l in readme_content:
-                                        err_msg = ('%s Includes line %d of '
-                                                   'boilerplate README.ex ')
+                                        err_msg = ('%s includes line %d of '
+                                                   'boilerplate README.ex')
                                         lint.warn(err_msg % (readme, lc))
                 except IOError as e:
                     lint.warn(

=== modified file 'charmtools/create.py'
--- charmtools/create.py	2013-12-11 16:27:55 +0000
+++ charmtools/create.py	2014-05-16 15:55:55 +0000
@@ -74,6 +74,11 @@
         print "Found " + package + " package in apt cache, as a result charm" \
               + " contents have been pre-populated based on package metadata."
 
+        # summary and description attrs moved to Version
+        # object in python-apt 0.7.9
+        if not hasattr(p, 'summary'):
+            p = p.versions[0]
+
         v['summary'] = p.summary
         v['description'] = textwrap.fill(p.description, width=72,
                                          subsequent_indent='  ')

=== modified file 'charmtools/proof.py'
--- charmtools/proof.py	2014-04-02 20:57:06 +0000
+++ charmtools/proof.py	2014-05-16 15:55:55 +0000
@@ -59,7 +59,8 @@
         except Exception as e:
             return ["FATAL: %s" % e.message], 200
 
-    lint, err_code = c.proof(with_remote, server, port, secure)
+    lint, err_code = c.proof(
+        remote=with_remote, server=server, port=port, secure=secure)
     return lint, err_code
 
 

=== modified file 'charmtools/templates/charm/README.ex'
--- charmtools/templates/charm/README.ex	2014-01-16 12:14:41 +0000
+++ charmtools/templates/charm/README.ex	2014-05-16 15:55:55 +0000
@@ -1,6 +1,6 @@
 # Overview
 
-Describe the intended usage of this charm and anything unique about how this charm relates to others here. 
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
 
 This README will be displayed in the Charm Store, it should be either Markdown or RST. Ideal READMEs include instructions on how to use the charm, expected usage, and charm features that your audience might be interested in. For an example of a well written README check out Hadoop: http://jujucharms.com/charms/precise/hadoop
 
@@ -16,17 +16,17 @@
 
     juju deploy servicename
 
-and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port. 
+and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port.
 
-You can then browse to http://ip-address to configure the service. 
+You can then browse to http://ip-address to configure the service.
 
 ## Scale out Usage
 
-If the charm has any recommendations for running at scale, outline them in examples here. For example if you have a memcached relation that improves performance, mention it here. 
+If the charm has any recommendations for running at scale, outline them in examples here. For example if you have a memcached relation that improves performance, mention it here.
 
 ## Known Limitations and Issues
 
-This not only helps users but gives people a place to start if they want to help you add features to your charm. 
+This not only helps users but gives people a place to start if they want to help you add features to your charm.
 
 # Configuration
 

=== modified file 'charmtools/test.py'
--- charmtools/test.py	2014-02-26 17:38:03 +0000
+++ charmtools/test.py	2014-05-16 15:55:55 +0000
@@ -417,6 +417,8 @@
     _keys = ['timeout', 'set-e', 'on-timeout', 'fail-on-skip', 'tests']
 
     def __init__(self, cfg):
+        self.log = logging.getLogger('juju-test.testcfg')
+
         if isinstance(cfg, basestring):
             cfg = yaml.safe_load(cfg)
 
@@ -425,7 +427,12 @@
                 if key in self._keys:
                     setattr(self, key, val)
         if 'substrates' in cfg:
-            self.substrates = cfg.substrates
+            self.substrates = cfg['substrates']
+
+    def update(self, **kw):
+        for key, val in kw.iteritems():
+            self.log.debug('Overwriting %s to %s from cmd' % (key, val))
+            setattr(self, key, val)
 
 
 def get_juju_version():
@@ -527,8 +534,20 @@
 
 
 def parse_substrates(spec):
+    """Return a :class:`SubstrateFilter` object parsed from ``spec``.
+
+    :param spec:
+
+        Can be a yaml string, a dict with a 'substrates' key, or an object
+        with a 'substrates' attribute. The 'substrates' key or attribute
+        should contain a dict with optional 'order', 'skip', and 'include'
+        keys.
+
+    """
     if isinstance(spec, basestring):
         spec = yaml.safe_load(spec)
+    elif not hasattr(spec, '__getitem__'):
+        spec = vars(spec)
     if not spec or 'substrates' not in spec:
         raise ValueError(
             "Invalid data passed to parse_substrates: {}".format(spec))
@@ -664,9 +683,7 @@
 
     if test_cfg:
         cfg = TestCfg(test_cfg)
-        for key, val in args.iteritems():
-            logger.debug('Overwriting %s to %s from cmd' % (key, val))
-            setattr(cfg, key, val)
+        cfg.update(**vars(args))
     else:
         cfg = args
 
@@ -674,7 +691,7 @@
     try:
         tester = Conductor(args)
         env_yaml = tester.get_environment(cfg.juju_env)
-        if 'substrates' in cfg:
+        if getattr(cfg, 'substrates', None):
             rules = parse_substrates(cfg)
             allowed = rules.filter(env_yaml['type'])
             if env_yaml['type'] not in allowed:

=== modified file 'tests/test_charm_proof.py'
--- tests/test_charm_proof.py	2014-04-30 19:27:07 +0000
+++ tests/test_charm_proof.py	2014-05-16 15:55:55 +0000
@@ -241,8 +241,8 @@
             'the type of the default value is str')
         self.assertEqual(expected, self.linter.lint[0])
 
-    def test_option_empty_default_value(self):
-        # An empty default value is treated as an error.
+    def test_option_empty_default_value_string(self):
+        # An empty default value is treated as INFO for strings
         self.write_config("""
             options:
               foo:
@@ -253,8 +253,52 @@
         self.linter.check_config_file(self.charm_dir)
         self.assertEqual(1, len(self.linter.lint))
         expected = (
-            'E: config.yaml: type of option foo is specified as string, '
-            'but the type of the default value is NoneType')
+            'I: config.yaml: option foo has no default value')
+        self.assertEqual(expected, self.linter.lint[0])
+
+    def test_option_empty_default_value_int(self):
+        # An empty default value is treated as INFO for ints
+        self.write_config("""
+            options:
+              foo:
+                type: int
+                default:
+                description: blah
+            """)
+        self.linter.check_config_file(self.charm_dir)
+        self.assertEqual(1, len(self.linter.lint))
+        expected = (
+            'I: config.yaml: option foo has no default value')
+        self.assertEqual(expected, self.linter.lint[0])
+
+    def test_option_empty_default_value_float(self):
+        # An empty default value is treated as INFO for floats
+        self.write_config("""
+            options:
+              foo:
+                type: float
+                default:
+                description: blah
+            """)
+        self.linter.check_config_file(self.charm_dir)
+        self.assertEqual(1, len(self.linter.lint))
+        expected = (
+            'I: config.yaml: option foo has no default value')
+        self.assertEqual(expected, self.linter.lint[0])
+
+    def test_option_empty_default_value_boolean(self):
+        # An empty default value is treated as WARN for booleans
+        self.write_config("""
+            options:
+              foo:
+                type: boolean
+                default:
+                description: blah
+            """)
+        self.linter.check_config_file(self.charm_dir)
+        self.assertEqual(1, len(self.linter.lint))
+        expected = (
+            'W: config.yaml: option foo has no default value')
         self.assertEqual(expected, self.linter.lint[0])
 
     def test_yaml_with_python_objects(self):

=== modified file 'tests/test_juju_test.py'
--- tests/test_juju_test.py	2014-02-26 17:38:03 +0000
+++ tests/test_juju_test.py	2014-05-16 15:55:55 +0000
@@ -720,3 +720,29 @@
         o = juju_test.Orchestra(c, 'test/dummy')
         o.perform()
         mprint_status.assert_called_once()
+
+
+class TestCfgTest(unittest.TestCase):
+    test_config = '''\
+    options:
+      timeout: 500
+    substrates:
+      order: include, skip
+      include: local
+      skip: "*"
+    '''
+
+    def test_init_str(self):
+        t = juju_test.TestCfg(self.test_config)
+        self.assertEqual(t.timeout, 500)
+        self.assertEqual(t.substrates['include'], 'local')
+
+    def test_init_dict(self):
+        t = juju_test.TestCfg(yaml.safe_load(self.test_config))
+        self.assertEqual(t.timeout, 500)
+        self.assertEqual(t.substrates['include'], 'local')
+
+    def test_update(self):
+        t = juju_test.TestCfg(self.test_config)
+        t.update(timeout=400)
+        self.assertEqual(t.timeout, 400)

=== modified file 'tests/test_substrates.py'
--- tests/test_substrates.py	2014-01-09 20:16:05 +0000
+++ tests/test_substrates.py	2014-05-16 15:55:55 +0000
@@ -24,9 +24,17 @@
         self.assertRaises(ValueError,  parse_substrates, '')
         self.assertIsNotNone(parse_substrates(self.INCLUDE_SKIP))
 
+    def test_parse_substrate_dict(self):
+        data = yaml.load(self.INCLUDE_SKIP)
+        self.assertIsNotNone(parse_substrates(data))
+
     def test_parse_substrate_object(self):
+        class Object(object):
+            pass
         data = yaml.load(self.INCLUDE_SKIP)
-        self.assertIsNotNone(parse_substrates(data))
+        o = Object()
+        o.__dict__ = data
+        self.assertIsNotNone(parse_substrates(o))
 
     def test_parse_substrates_order(self):
         result = parse_substrates(self.INCLUDE_SKIP)

=== modified file 'tests_functional/charms/broken-maintainer/README.ex'
--- tests_functional/charms/broken-maintainer/README.ex	2013-11-11 19:08:11 +0000
+++ tests_functional/charms/broken-maintainer/README.ex	2014-05-16 15:55:55 +0000
@@ -1,5 +1,4 @@
-Describe the intended usage of this charm and anything unique about how
-this charm relates to others here.
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
 
 Be sure to remove this section before submitting this to
 https://launchpad.net/charms for inclusion in the charm store.

=== modified file 'tests_functional/charms/icon-template/README.ex'
--- tests_functional/charms/icon-template/README.ex	2013-11-11 19:08:11 +0000
+++ tests_functional/charms/icon-template/README.ex	2014-05-16 15:55:55 +0000
@@ -1,5 +1,4 @@
-Describe the intended usage of this charm and anything unique about how
-this charm relates to others here.
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
 
 Be sure to remove this section before submitting this to
 https://launchpad.net/charms for inclusion in the charm store.

=== modified file 'tests_functional/charms/missing-maintainer/README.ex'
--- tests_functional/charms/missing-maintainer/README.ex	2013-11-11 19:08:11 +0000
+++ tests_functional/charms/missing-maintainer/README.ex	2014-05-16 15:55:55 +0000
@@ -1,5 +1,4 @@
-Describe the intended usage of this charm and anything unique about how
-this charm relates to others here.
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
 
 Be sure to remove this section before submitting this to
 https://launchpad.net/charms for inclusion in the charm store.

=== modified file 'tests_functional/charms/test/README.ex'
--- tests_functional/charms/test/README.ex	2013-11-11 19:08:11 +0000
+++ tests_functional/charms/test/README.ex	2014-05-16 15:55:55 +0000
@@ -1,5 +1,4 @@
-Describe the intended usage of this charm and anything unique about how
-this charm relates to others here.
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
 
 Be sure to remove this section before submitting this to
 https://launchpad.net/charms for inclusion in the charm store.

=== modified file 'tests_functional/charms/unknown-metadata/README.ex'
--- tests_functional/charms/unknown-metadata/README.ex	2013-11-11 19:08:11 +0000
+++ tests_functional/charms/unknown-metadata/README.ex	2014-05-16 15:55:55 +0000
@@ -1,5 +1,4 @@
-Describe the intended usage of this charm and anything unique about how
-this charm relates to others here.
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
 
 Be sure to remove this section before submitting this to
 https://launchpad.net/charms for inclusion in the charm store.

=== modified file 'tests_functional/create/no-package-exists/README.ex'
--- tests_functional/create/no-package-exists/README.ex	2013-11-11 19:08:11 +0000
+++ tests_functional/create/no-package-exists/README.ex	2014-05-16 15:55:55 +0000
@@ -1,41 +1,44 @@
-Describe the intended usage of this charm and anything unique about how
-this charm relates to others here. 
+# Overview
+
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
 
 This README will be displayed in the Charm Store, it should be either Markdown or RST. Ideal READMEs include instructions on how to use the charm, expected usage, and charm features that your audience might be interested in. For an example of a well written README check out Hadoop: http://jujucharms.com/charms/precise/hadoop
 
-Here's an example you might wish to template off of:
-
-Overview
---------
-
-This charm provides (service) from (service homepage). Add a description here of what the service itself actually does. 
-
-
-Usage
------
+Use this as a Markdown reference if you need help with the formatting of this README: http://askubuntu.com/editing-help
+
+This charm provides [service](http://example.com). Add a description here of what the service itself actually does.
+
+Also remember to check the [icon guidelines](https://juju.ubuntu.com/docs/authors-charm-icon.html) so that your charm looks good in the Juju GUI.
+
+# Usage
 
 Step by step instructions on using the charm:
 
     juju deploy servicename
 
-and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port. 
-
-You can then browse to http://ip-address to configure the service. 
-
-Configuration
--------------
+and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port.
+
+You can then browse to http://ip-address to configure the service.
+
+## Scale out Usage
+
+If the charm has any recommendations for running at scale, outline them in examples here. For example if you have a memcached relation that improves performance, mention it here.
+
+## Known Limitations and Issues
+
+This not only helps users but gives people a place to start if they want to help you add features to your charm.
+
+# Configuration
 
 The configuration options will be listed on the charm store, however If you're making assumptions or opinionated decisions in the charm (like setting a default administrator password), you should detail that here so the user knows how to change it immediately, etc.
 
-
-Contact Information
--------------------
+# Contact Information
 
 Though this will be listed in the charm store itself don't assume a user will know that, so include that information here:
 
-Author:
-Report bugs at: http://bugs.launchpad.net/charms/+source/charmname
-Location: http://jujucharms.com/charms/distro/charmname
-
-* Be sure to remove the templated parts before submitting to https://launchpad.net/charms for inclusion in the charm store.
-
+## Upstream Project Name
+
+- Upstream website
+- Upstream bug tracker
+- Upstream mailing list or contact information
+- Feel free to add things if it's useful for users

=== modified file 'tests_functional/create/python-apt/README.ex'
--- tests_functional/create/python-apt/README.ex	2013-11-11 19:08:11 +0000
+++ tests_functional/create/python-apt/README.ex	2014-05-16 15:55:55 +0000
@@ -1,41 +1,44 @@
-Describe the intended usage of this charm and anything unique about how
-this charm relates to others here. 
+# Overview
+
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
 
 This README will be displayed in the Charm Store, it should be either Markdown or RST. Ideal READMEs include instructions on how to use the charm, expected usage, and charm features that your audience might be interested in. For an example of a well written README check out Hadoop: http://jujucharms.com/charms/precise/hadoop
 
-Here's an example you might wish to template off of:
-
-Overview
---------
-
-This charm provides (service) from (service homepage). Add a description here of what the service itself actually does. 
-
-
-Usage
------
+Use this as a Markdown reference if you need help with the formatting of this README: http://askubuntu.com/editing-help
+
+This charm provides [service](http://example.com). Add a description here of what the service itself actually does.
+
+Also remember to check the [icon guidelines](https://juju.ubuntu.com/docs/authors-charm-icon.html) so that your charm looks good in the Juju GUI.
+
+# Usage
 
 Step by step instructions on using the charm:
 
     juju deploy servicename
 
-and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port. 
-
-You can then browse to http://ip-address to configure the service. 
-
-Configuration
--------------
+and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port.
+
+You can then browse to http://ip-address to configure the service.
+
+## Scale out Usage
+
+If the charm has any recommendations for running at scale, outline them in examples here. For example if you have a memcached relation that improves performance, mention it here.
+
+## Known Limitations and Issues
+
+This not only helps users but gives people a place to start if they want to help you add features to your charm.
+
+# Configuration
 
 The configuration options will be listed on the charm store, however If you're making assumptions or opinionated decisions in the charm (like setting a default administrator password), you should detail that here so the user knows how to change it immediately, etc.
 
-
-Contact Information
--------------------
+# Contact Information
 
 Though this will be listed in the charm store itself don't assume a user will know that, so include that information here:
 
-Author:
-Report bugs at: http://bugs.launchpad.net/charms/+source/charmname
-Location: http://jujucharms.com/charms/distro/charmname
-
-* Be sure to remove the templated parts before submitting to https://launchpad.net/charms for inclusion in the charm store.
-
+## Upstream Project Name
+
+- Upstream website
+- Upstream bug tracker
+- Upstream mailing list or contact information
+- Feel free to add things if it's useful for users

=== modified file 'tests_functional/proof/expected/broken-categories'
--- tests_functional/proof/expected/broken-categories	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/broken-categories	2014-05-16 15:55:55 +0000
@@ -1,1 +1,2 @@
 W: Categories metadata must be a list of one or more of: applications, app-servers, databases, file-servers, cache-proxy, misc
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/broken-config'
--- tests_functional/proof/expected/broken-config	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/broken-config	2014-05-16 15:55:55 +0000
@@ -1,1 +1,2 @@
+I: missing recommended hook config-changed
 W: config.yaml: option foo has an invalid type (integer)

=== modified file 'tests_functional/proof/expected/broken-maintainer'
--- tests_functional/proof/expected/broken-maintainer	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/broken-maintainer	2014-05-16 15:55:55 +0000
@@ -1,12 +1,12 @@
 W: metadata name (test) must match directory name (broken-maintainer) exactly for local deployment.
 W: Maintainer address should contain a real-name and email only. [test@testhost]
-E: no copyright file
-E: Includes template README.ex file
-E: README.ex Includes boilerplate README.ex line 1
-E: README.ex Includes boilerplate README.ex line 2
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
+W: no copyright file
+W: Includes template README.ex file
+W: README.ex includes line 1 of boilerplate README.ex
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/broken-subordinate'
--- tests_functional/proof/expected/broken-subordinate	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/broken-subordinate	2014-05-16 15:55:55 +0000
@@ -1,1 +1,2 @@
 E: subordinates must have at least one scope: container relation
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/broken-subordinate2'
--- tests_functional/proof/expected/broken-subordinate2	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/broken-subordinate2	2014-05-16 15:55:55 +0000
@@ -1,1 +1,2 @@
 E: subordinates must have at least one scope: container relation
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/empty-requires'
--- tests_functional/proof/expected/empty-requires	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/empty-requires	2014-05-16 15:55:55 +0000
@@ -1,1 +1,2 @@
-W: all charms should provide at least one thing
+I: all charms should provide at least one thing
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/icon-template'
--- tests_functional/proof/expected/icon-template	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/icon-template	2014-05-16 15:55:55 +0000
@@ -1,8 +1,7 @@
-E: Includes template icon.svg file.
-E: no copyright file
-E: Includes template README.ex file
-E: README.ex Includes boilerplate README.ex line 1
-E: README.ex Includes boilerplate README.ex line 2
+W: Includes template icon.svg file.
+W: no copyright file
+W: Includes template README.ex file
+W: README.ex includes line 1 of boilerplate README.ex
 E: template interface names should be changed: interface-name
 E: Unknown relation field in relation relation-name - (baz)
 E: template relations should be renamed to fit charm: relation-name
@@ -13,3 +12,4 @@
 I: relation non-map has no hooks
 E: template interface names should be changed: interface-name
 E: template relations should be renamed to fit charm: relation-name
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/missing-maintainer'
--- tests_functional/proof/expected/missing-maintainer	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/missing-maintainer	2014-05-16 15:55:55 +0000
@@ -1,12 +1,12 @@
 W: metadata name (test) must match directory name (missing-maintainer) exactly for local deployment.
 E: Charms need a maintainer (See RFC2822) - Name <email>
-E: no copyright file
-E: Includes template README.ex file
-E: README.ex Includes boilerplate README.ex line 1
-E: README.ex Includes boilerplate README.ex line 2
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
+W: no copyright file
+W: Includes template README.ex file
+W: README.ex includes line 1 of boilerplate README.ex
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/mod-spdy'
--- tests_functional/proof/expected/mod-spdy	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/mod-spdy	2014-05-16 15:55:55 +0000
@@ -1,2 +1,3 @@
-W: missing recommended hook start
-W: missing recommended hook stop
+I: missing recommended hook start
+I: missing recommended hook stop
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/test'
--- tests_functional/proof/expected/test	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/test	2014-05-16 15:55:55 +0000
@@ -1,12 +1,12 @@
 W: Metadata is missing categories.
 W: No icon.svg file.
-E: no copyright file
-E: Includes template README.ex file
-E: README.ex Includes boilerplate README.ex line 1
-E: README.ex Includes boilerplate README.ex line 2
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
-E: template interface names should be changed: interface-name
-E: template relations should be renamed to fit charm: relation-name
+W: no copyright file
+W: Includes template README.ex file
+W: README.ex includes line 1 of boilerplate README.ex
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+E: template interface names should be changed: interface-name
+E: template relations should be renamed to fit charm: relation-name
+I: missing recommended hook config-changed

=== modified file 'tests_functional/proof/expected/unknown-metadata'
--- tests_functional/proof/expected/unknown-metadata	2013-11-11 19:08:11 +0000
+++ tests_functional/proof/expected/unknown-metadata	2014-05-16 15:55:55 +0000
@@ -1,9 +1,8 @@
 E: Unknown root metadata field (foo)
 W: metadata name (test) must match directory name (unknown-metadata) exactly for local deployment.
-E: no copyright file
-E: Includes template README.ex file
-E: README.ex Includes boilerplate README.ex line 1
-E: README.ex Includes boilerplate README.ex line 2
+W: no copyright file
+W: Includes template README.ex file
+W: README.ex includes line 1 of boilerplate README.ex
 E: template interface names should be changed: interface-name
 E: Unknown relation field in relation relation-name - (baz)
 E: template relations should be renamed to fit charm: relation-name
@@ -14,3 +13,4 @@
 I: relation non-map has no hooks
 E: template interface names should be changed: interface-name
 E: template relations should be renamed to fit charm: relation-name
+I: missing recommended hook config-changed