Merge lp:~tvansteenburgh/charm-tools/lp-1357507 into lp:charm-tools/1.3

[Tim Van Steenburgh]

Make non-executable hook file a proof ERROR instead of INFO.

Unmerged revisions

338. By Tim Van Steenburgh on 2014-08-28

Make non-executable hook a proof error

=== modified file 'charmtools/charms.py'
--- charmtools/charms.py	2014-06-17 15:44:04 +0000
+++ charmtools/charms.py	2014-08-28 16:53:40 +0000
@@ -58,7 +58,7 @@
         try:
             mode = os.stat(hook_path)[ST_MODE]
             if not mode & S_IXUSR:
-                self.info(hook + " not executable")
+                self.err(hook + " not executable")
             with open(hook_path, 'r') as hook_file:
                 count = 0
                 for line in hook_file:
@@ -247,9 +247,10 @@
 
             charm_basename = os.path.basename(charm_path)
             if charm['name'] != charm_basename:
-                warn_msg = ("metadata name (%s) must match directory name (%s)"
-                            " exactly for local deployment.") % (
-                                charm['name'], charm_basename)
+                warn_msg = (
+                    "metadata name (%s) must match directory name (%s)"
+                    " exactly for local deployment.") % (
+                        charm['name'], charm_basename)
                 lint.warn(warn_msg)
 
             # summary should be short
 
=== modified file 'tests_functional/charms/test/hooks/install' (properties changed: +x to -x)
=== modified file 'tests_functional/create/test_python_create.py'
--- tests_functional/create/test_python_create.py	2014-06-20 19:46:59 +0000
+++ tests_functional/create/test_python_create.py	2014-08-28 16:53:40 +0000
@@ -39,6 +39,8 @@
 
 
 class PythonCreateTest(TestCase):
+    maxDiff = None
+
     def setUp(self):
         self.tempdir = tempfile.mkdtemp()
 
@@ -58,6 +60,10 @@
             'lib/charmhelpers/core/fstab.py',
             'lib/charmhelpers/core/hookenv.py',
             'lib/charmhelpers/core/host.py',
+            'lib/charmhelpers/core/services/__init__.py',
+            'lib/charmhelpers/core/services/base.py',
+            'lib/charmhelpers/core/services/helpers.py',
+            'lib/charmhelpers/core/templating.py',
         ]
         return sorted(static_files + dynamic_files)
 
 
=== modified file 'tests_functional/proof/expected/test'
--- tests_functional/proof/expected/test	2014-05-16 06:06:43 +0000
+++ tests_functional/proof/expected/test	2014-08-28 16:53:40 +0000
@@ -9,4 +9,5 @@
 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: install not executable
 I: missing recommended hook config-changed