Merge "support "" equals to None check in Testcase.is_compatible"

1 files changed, 7 insertions, 3 deletions

diff --git a/ci/tier_handler.py b/ci/tier_handler.py
index e50fbe6fd..1eadfba50 100644
--- a/ci/tier_handler.py
+++ b/ci/tier_handler.py
@@ -111,17 +111,21 @@ class TestCase:
         self.criteria = criteria
         self.blocking = blocking
 
+    @staticmethod
+    def is_none(item):
+        return item is None or item is ""
+
     def is_compatible(self, ci_installer, ci_scenario):
         try:
-            if ci_installer is not None:
+            if not self.is_none(ci_installer):
                 if re.search(self.dependency.get_installer(),
                              ci_installer) is None:
                     return False
-            if ci_scenario is not None:
+            if not self.is_none(ci_scenario):
                 if re.search(self.dependency.get_scenario(),
                              ci_scenario) is None:
                     return False
-            return not (ci_scenario is None and ci_installer is None)
+            return True
         except TypeError:
             return False