aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-05-17 08:19:49 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-17 08:19:49 +0000
commit8f645a8d931da93f99c15593e2bd1f4d93a6d987 (patch)
tree0396bfc7f7c8cdb8b68c5f3ba7dbd23cff21e0e2
parenta6ecd279e2d9191aee8f903528056f0cc84a09fa (diff)
parent4c1c1361b1d3167c167dfdec7431cc39ed442db6 (diff)
Merge "Catch TypeError exceptions in ci/tier_handler.py"
-rw-r--r--ci/tier_handler.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/ci/tier_handler.py b/ci/tier_handler.py
index dd0d10c9..2fc7a9c4 100644
--- a/ci/tier_handler.py
+++ b/ci/tier_handler.py
@@ -108,14 +108,14 @@ class TestCase:
self.description = description
def is_compatible(self, ci_installer, ci_scenario):
- if re.search(self.dependency.get_installer(), ci_installer) is None:
+ try:
+ return not (re.search(self.dependency.get_installer(),
+ ci_installer) is None or
+ re.search(self.dependency.get_scenario(),
+ ci_scenario) is None)
+ except TypeError:
return False
- if re.search(self.dependency.get_scenario(), ci_scenario) is None:
- return False
-
- return True
-
def get_name(self):
return self.name