Merge "Remove obsolete repos in functest/ci/config_functest.yaml"

[functest.git] / functest / ci / tier_handler.py

diff --git a/functest/ci/tier_handler.py b/functest/ci/tier_handler.py
old mode 100755 (executable)
new mode 100644 (file)
index 6b4864b..4f2f14e
--- a/functest/ci/tier_handler.py
+++ b/functest/ci/tier_handler.py
@@ -105,16 +105,16 @@ class Tier(object):
 class TestCase(object):
 
     def __init__(self, name,
+                 enabled,
                  dependency,
                  criteria,
                  blocking,
-                 clean_flag,
                  description=""):
         self.name = name
+        self.enabled = enabled
         self.dependency = dependency
         self.criteria = criteria
         self.blocking = blocking
-        self.clean_flag = clean_flag
         self.description = description
 
     @staticmethod
@@ -138,15 +138,15 @@ class TestCase(object):
     def get_name(self):
         return self.name
 
+    def is_enabled(self):
+        return self.enabled
+
     def get_criteria(self):
         return self.criteria
 
     def is_blocking(self):
         return self.blocking
 
-    def needs_clean(self):
-        return self.clean_flag
-
     def __str__(self):
         lines = split_text(self.description, LINE_LENGTH - 6)
 
@@ -158,7 +158,7 @@ class TestCase(object):
         for line in lines:
             out += ("|    " + line.ljust(LINE_LENGTH - 7) + " |\n")
         out += ("| Criteria:  " +
-                self.criteria.ljust(LINE_LENGTH - 14) + "|\n")
+                str(self.criteria).ljust(LINE_LENGTH - 14) + "|\n")
         out += ("| Dependencies:".ljust(LINE_LENGTH - 1) + "|\n")
         installer = self.dependency.get_installer()
         scenario = self.dependency.get_scenario()