Merge "Fix warnings in all snaps-related modules"

[functest.git] / functest / ci / tier_handler.py

diff --git a/functest/ci/tier_handler.py b/functest/ci/tier_handler.py
index cbabe63..9fc3f24 100644 (file)
--- a/functest/ci/tier_handler.py
+++ b/functest/ci/tier_handler.py
@@ -7,6 +7,8 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+"""Tier and TestCase classes to wrap the testcases config file"""
+# pylint: disable=missing-docstring
 
 import re
 import textwrap
@@ -100,13 +102,9 @@ class Tier(object):
 
 class TestCase(object):
 
-    def __init__(self, name,
-                 enabled,
-                 dependency,
-                 criteria,
-                 blocking,
-                 description="",
-                 project=""):
+    def __init__(self, name, enabled, dependency, criteria, blocking,
+                 description="", project=""):
+        # pylint: disable=too-many-arguments
         self.name = name
         self.enabled = enabled
         self.dependency = dependency
@@ -117,13 +115,10 @@ class TestCase(object):
 
     @staticmethod
     def is_none(item):
-        return item is None or item is ""
+        return item is None or item == ""
 
     def is_compatible(self, ci_installer, ci_scenario):
         try:
-            if (self.is_none(ci_installer) and not
-                    self.is_none(self.dependency.get_installer())):
-                return False
             if not self.is_none(ci_installer):
                 if re.search(self.dependency.get_installer(),
                              ci_installer) is None: