From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 13 May 2016 09:01:52 +0000 (+0200)
Subject: Catch TypeError exceptions in ci/tier_handler.py
X-Git-Tag: colorado.1.0~380^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F14083%2F1;p=functest.git

Catch TypeError exceptions in ci/tier_handler.py

If INSTALLER_TYPE is unset, is_compatible returns False instead of
raising an ErrorType exception.

Change-Id: I55c219808851907a19e2aa0124eb13d53a5e685d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/ci/tier_handler.py b/ci/tier_handler.py
index dd0d10c9e..2fc7a9c4d 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