Merge "bug fix: if all tests passed failed could be empty"

[functest.git] / ci / tier_handler.py

diff --git a/ci/tier_handler.py b/ci/tier_handler.py
index 2fc7a9c..b1ef52d 100644 (file)
--- a/ci/tier_handler.py
+++ b/ci/tier_handler.py
@@ -74,7 +74,7 @@ class Tier:
         return self.ci_loop
 
     def __str__(self):
-        lines = split_text(self.description, LINE_LENGTH-6)
+        lines = split_text(self.description, LINE_LENGTH - 6)
 
         out = ""
         out += ("+%s+\n" % ("=" * (LINE_LENGTH - 2)))
@@ -109,10 +109,15 @@ class TestCase:
 
     def is_compatible(self, ci_installer, ci_scenario):
         try:
-            return not (re.search(self.dependency.get_installer(),
-                                  ci_installer) is None or
-                        re.search(self.dependency.get_scenario(),
-                                  ci_scenario) is None)
+            if ci_installer is not None:
+                if re.search(self.dependency.get_installer(),
+                             ci_installer) is None:
+                    return False
+            if ci_scenario is not None:
+                if re.search(self.dependency.get_scenario(),
+                             ci_scenario) is None:
+                    return False
+            return not (ci_scenario is None and ci_installer is None)
         except TypeError:
             return False
 
@@ -120,7 +125,7 @@ class TestCase:
         return self.name
 
     def __str__(self):
-        lines = split_text(self.description, LINE_LENGTH-6)
+        lines = split_text(self.description, LINE_LENGTH - 6)
 
         out = ""
         out += ("+%s+\n" % ("=" * (LINE_LENGTH - 2)))