lint cleanup; fix test dependency typo; remove fakefail

metadata.yaml

@@ -4,7 +4,7 @@ maintainer: James Page <james.page@ubuntu.com>
 description: |
  Ceph is a distributed storage and network file system designed to provide
  excellent performance, reliability, and scalability.
-categories:
+tags:
     - file-servers
 peers:
   mon:

tests/00-setup

@@ -5,7 +5,7 @@ set -ex
 sudo add-apt-repository --yes ppa:juju/stable
 sudo apt-get update --yes
 sudo apt-get install --yes python-amulet \
-                           python-distroinfo \
+                           python-distro-info \
                            python-keystoneclient \
                            python-glanceclient \
                            python-cinderclient \

tests/basic_deployment.py

@@ -185,7 +185,7 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
         obj_count = df['pools'][pool_id]['stats']['objects']
         kb_used = df['pools'][pool_id]['stats']['kb_used']
         u.log.debug('Ceph {} pool (ID {}): {} objects, '
-                    '{} kb used'.format(_pool_name,
+                    '{} kb used'.format(pool_name,
                                         pool_id,
                                         obj_count,
                                         kb_used))
@@ -598,7 +598,3 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
 
     # FYI: No restart check as ceph services do not restart
     # when charm config changes, unless monitor count increases.
-
-    def test_999(self):
-        u.log.error('Fake fail!')
-        raise

tests/charmhelpers/contrib/amulet/utils.py

@@ -423,7 +423,7 @@ class AmuletUtils(object):
     def check_commands_on_units(self, commands, sentry_units):
         """Check that all commands in a list exit zero on all
         sentry units in a list.
-        
+
         :param commands:  list of bash commands
         :param sentry_units:  list of sentry unit pointers
         :returns: None if successful; Failure message otherwise