Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Stop personalizing the common Dockerfile"
[functest.git]
/
functest
/
ci
/
tier_handler.py
diff --git
a/functest/ci/tier_handler.py
b/functest/ci/tier_handler.py
index
1eadfba
..
4f2f14e
100644
(file)
--- a/
functest/ci/tier_handler.py
+++ b/
functest/ci/tier_handler.py
@@
-28,7
+28,7
@@
def split_text(text, max_len):
return lines
return lines
-class Tier:
+class Tier
(object)
:
def __init__(self, name, order, ci_loop, description=""):
self.tests_array = []
def __init__(self, name, order, ci_loop, description=""):
self.tests_array = []
@@
-102,14
+102,20
@@
class Tier:
return out
return out
-class TestCase:
+class TestCase
(object)
:
- def __init__(self, name, dependency, criteria, blocking, description=""):
+ def __init__(self, name,
+ enabled,
+ dependency,
+ criteria,
+ blocking,
+ description=""):
self.name = name
self.name = name
+ self.enabled = enabled
self.dependency = dependency
self.dependency = dependency
- self.description = description
self.criteria = criteria
self.blocking = blocking
self.criteria = criteria
self.blocking = blocking
+ self.description = description
@staticmethod
def is_none(item):
@staticmethod
def is_none(item):
@@
-132,6
+138,9
@@
class TestCase:
def get_name(self):
return self.name
def get_name(self):
return self.name
+ def is_enabled(self):
+ return self.enabled
+
def get_criteria(self):
return self.criteria
def get_criteria(self):
return self.criteria
@@
-149,7
+158,7
@@
class TestCase:
for line in lines:
out += ("| " + line.ljust(LINE_LENGTH - 7) + " |\n")
out += ("| Criteria: " +
for line in lines:
out += ("| " + line.ljust(LINE_LENGTH - 7) + " |\n")
out += ("| Criteria: " +
- s
elf.criteria
.ljust(LINE_LENGTH - 14) + "|\n")
+ s
tr(self.criteria)
.ljust(LINE_LENGTH - 14) + "|\n")
out += ("| Dependencies:".ljust(LINE_LENGTH - 1) + "|\n")
installer = self.dependency.get_installer()
scenario = self.dependency.get_scenario()
out += ("| Dependencies:".ljust(LINE_LENGTH - 1) + "|\n")
installer = self.dependency.get_installer()
scenario = self.dependency.get_scenario()
@@
-160,7
+169,7
@@
class TestCase:
return out
return out
-class Dependency:
+class Dependency
(object)
:
def __init__(self, installer, scenario):
self.installer = installer
def __init__(self, installer, scenario):
self.installer = installer