TKO needs to display TEST_NA and RUNNING jobs differently than the
rest.
Signed-off-by: Jeremy Orlow <jorlow@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1945 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tko/display.py b/tko/display.py
index f233fb8..ac20ec2 100755
--- a/tko/display.py
+++ b/tko/display.py
@@ -155,7 +155,7 @@
average_grade = 0
total_count = 0
for key in status_count.keys():
- if key != 8: # TEST_NA status
+ if key not in (8, 9): # TEST_NA, RUNNING
average_grade += (grade_from_status(key)
* status_count[key])
total_count += status_count[key]
@@ -199,13 +199,15 @@
status_count: dict mapping from status (integer key) to count
eg. { 'GOOD' : 4, 'FAIL' : 1 }
"""
- status_count = box_data.status_count
- if 6 in status_count.keys():
- html = "%d / %d " \
- %(status_count[6],sum(status_count.values()))
- else:
- html = "%d / %d " % \
- (0, sum(status_count.values()))
+ status_count_subset = box_data.status_count.copy()
+ status_count_subset[8] = 0 # Don't count TEST_NA
+ status_count_subset[9] = 0 # Don't count RUNNING
+ html = "%d / %d " % (status_count_subset.get(6, 0),
+ sum(status_count_subset.values()))
+ if 8 in box_data.status_count.keys():
+ html += ' (%d N/A)' % box_data.status_count[8]
+ if 9 in box_data.status_count.keys():
+ html += ' (%d running)' % box_data.status_count[9]
if box_data.reasons_list:
reasons_list = box_data.reasons_list
@@ -222,9 +224,9 @@
html += '<br>' + reason
tooltip = ""
- for status in sorted(status_count.keys(), reverse = True):
+ for status in sorted(box_data.status_count.keys(), reverse = True):
status_word = db.status_word[status]
- tooltip += "%d %s " % (status_count[status], status_word)
+ tooltip += "%d %s " % (box_data.status_count[status], status_word)
return (html,tooltip)