tests: fix new pylint reported issues

Change-Id: I8d8e09c10bab6f630e7aa27e8078c37b472fede3

cumin/backends/puppetdb.py

@@ -443,7 +443,7 @@ def _get_resource_query(self, key, value=None, operator='='):  # pylint: disable
             raise InvalidQueryError(("Resource key cannot contain both '%' (query a resource's parameter) and '@' "
                                      "(query a  resource's field)"))
 
-        elif '%' in key:
+        if '%' in key:
             # Querying a specific parameter of the resource
             if operator == '~' and self.api_version == 3:
                 raise InvalidQueryError('Regex operations are not supported in PuppetDB API v3 for resource parameters')
@@ -487,7 +487,7 @@ def _get_special_resource_query(self, category, key, value, operator):
         if all(char in key for char in ('%', '@')):
             raise InvalidQueryError(("Resource key cannot contain both '%' (query a resource's parameter) and '@' "
                                      "(query a  resource's field)"))
-        elif '%' in key:
+        if '%' in key:
             special = '%'
             key, param = key.split('%')
         elif '@' in key:

cumin/cli.py

@@ -332,7 +332,7 @@ def get_hosts(args, config):
 
         if answer in 'yY':
             break
-        elif answer in 'nN':
+        if answer in 'nN':
             raise KeyboardInterruptError
 
     else:

cumin/tests/unit/transports/test_clustershell.py

@@ -147,8 +147,6 @@ def test_handler_setter_invalid(self):
         class InvalidClass:
             """Invalid class."""
 
-            pass
-
         with pytest.raises(WorkerError, match='handler must be one of'):
             self.worker.handler = 'invalid-handler'