Code Review
/
functest-kubernetes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fallback to item calculation
[functest-kubernetes.git]
/
functest_kubernetes
/
cnf_conformance
/
conformance.py
diff --git
a/functest_kubernetes/cnf_conformance/conformance.py
b/functest_kubernetes/cnf_conformance/conformance.py
index
8956598
..
fa174f1
100644
(file)
--- a/
functest_kubernetes/cnf_conformance/conformance.py
+++ b/
functest_kubernetes/cnf_conformance/conformance.py
@@
-81,13
+81,21
@@
class CNFConformance(testcase.TestCase):
msg = prettytable.PrettyTable(
header_style='upper', padding_width=5,
field_names=['name', 'status'])
msg = prettytable.PrettyTable(
header_style='upper', padding_width=5,
field_names=['name', 'status'])
+ item_criteria = 0
for item in self.details['items']:
msg.add_row([item['name'], item['status']])
for item in self.details['items']:
msg.add_row([item['name'], item['status']])
+ if item['status'] == "passed":
+ item_criteria += 1
+ else:
+ self.__logger.warning(
+ "%s %s", item['name'], item['status'])
self.__logger.info("\n\n%s\n", msg.get_string())
grp = re.search(
r'Final .* score: (\d+) of (\d+)', output.decode("utf-8"))
if grp:
self.result = int(grp.group(1)) / int(grp.group(2)) * 100
self.__logger.info("\n\n%s\n", msg.get_string())
grp = re.search(
r'Final .* score: (\d+) of (\d+)', output.decode("utf-8"))
if grp:
self.result = int(grp.group(1)) / int(grp.group(2)) * 100
+ else:
+ self.result = item_criteria / len(self.details['items']) * 100
if not os.path.exists(self.res_dir):
os.makedirs(self.res_dir)
shutil.copy2(
if not os.path.exists(self.res_dir):
os.makedirs(self.res_dir)
shutil.copy2(