summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalentin boucher <valentin.boucher@orange.com>2016-08-04 08:20:52 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-04 08:20:52 +0000
commit3acdf5161577bfc5b01d677c4e5c7eefb0042cde (patch)
tree4c5b29f23e1d511856200278e3a9ab511fbeb774
parenta2ea4ad06112d5ac61d62a117b228ef30867ba60 (diff)
parent488a342ede61f38af476746febda26e4a2ca5dcd (diff)
Merge "support "" equals to None check in Testcase.is_compatible"
-rw-r--r--ci/tier_handler.py10
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