fixed by tox

src/rotest/core/result/monitor/monitor.py

@@ -3,6 +3,7 @@
 Implement monitors and use them as output handlers to monitor background
 processes, statuses and resources.
 """
+# pylint: disable=broad-except
 from functools import wraps
 
 from server import MonitorServer

src/rotest/core/result/result.py

@@ -1,8 +1,8 @@
 """Tests results handling interface."""
 # pylint: disable=invalid-name,too-few-public-methods,arguments-differ
 # pylint: disable=too-many-arguments,dangerous-default-value
-import pkg_resources
 from unittest.result import TestResult
+import pkg_resources
 
 from rotest.common import core_log
 from rotest.core.models.case_data import TestOutcome

src/rotest/core/utils/common.py

@@ -38,9 +38,8 @@ def print_test_instance(test_name, depth, tag_filter, test_tags, all_tags):
         print colored(test_format, MAGENTA)
         return True
 
-    else:
-        print test_format
-        return False
+    print test_format
+    return False
 
 
 def print_test_hierarchy(test, tag_filter, tags=[], depth=0):

src/rotest/management/base_resource.py

@@ -3,7 +3,7 @@
 Defines the basic attributes & interface of any resource type class,
 responsible for the resource static & dynamic information.
 """
-# pylint: disable=too-many-instance-attributes,no-self-use
+# pylint: disable=too-many-instance-attributes,no-self-use,broad-except
 import os
 from bdb import BdbQuit
 

src/rotest/management/client/manager.py

@@ -347,7 +347,7 @@ def _find_matching_resources(self, descriptor, resources):
         if descriptor.type.DATA_CLASS is None:
             # Dataless resource
             matching_resources = [resource for resource in resources
-                                  if type(resource) == descriptor.type]
+                                  if isinstance(resource, descriptor.type)]
 
             for field_name, value in descriptor.properties.items():
                 for resource in matching_resources[:]:

tests/core/test_flow.py

@@ -470,7 +470,7 @@ def test_flow_expect_failure(self):
         MockFlow.blocks = (StoreFailuresBlock.params(mode=MODE_CRITICAL),
                            SuccessBlock.params(mode=MODE_CRITICAL),
                            StoreFailuresBlock.params(mode=MODE_FINALLY))
-    
+
         test_flow = MockFlow()
         self.run_test(test_flow)
 

tests/management/test_resource_manager.py

@@ -253,9 +253,9 @@ def test_lock_service_twice(self):
         * Make sure the lock succeeded and that we get different resources.
         """
         descriptor = Descriptor(DemoService, name=self.FREE1_NAME)
-        
+
         previous_resources = []
-        
+
         for _ in xrange(2):
             resources = self.client._lock_resources(descriptors=[descriptor],
                                                     timeout=self.LOCK_TIMEOUT)