| Index: dashboard/dashboard/speed_releasing.py
|
| diff --git a/dashboard/dashboard/speed_releasing.py b/dashboard/dashboard/speed_releasing.py
|
| index e06abb64fd2b51cfe0af6203a94f56c87c4a60b9..16a46f6d283d507310d073f3b70baffae15b046e 100644
|
| --- a/dashboard/dashboard/speed_releasing.py
|
| +++ b/dashboard/dashboard/speed_releasing.py
|
| @@ -46,7 +46,7 @@ class SpeedReleasingHandler(request_handler.RequestHandler):
|
| self.GetDynamicVariables(values)
|
|
|
| master_bot_pairs = _GetMasterBotPairs(table_entity.bots)
|
| - expanded_tests = _ExpandTests(table_entity.tests)
|
| + # expanded_tests = _ExpandTests(table_entity.tests)
|
|
|
| rev_a = self.request.get('revA')
|
| rev_b = self.request.get('revB')
|
| @@ -62,8 +62,9 @@ class SpeedReleasingHandler(request_handler.RequestHandler):
|
| 'table_tests': table_entity.tests,
|
| 'table_layout': json.loads(table_entity.table_layout),
|
| 'name': table_entity.key.string_id(),
|
| - 'values': _GetRowValues(revisions, master_bot_pairs, expanded_tests),
|
| - 'units': _GetTestToUnitsMap(master_bot_pairs, expanded_tests),
|
| + 'values': _GetRowValues(revisions, master_bot_pairs,
|
| + table_entity.tests),
|
| + 'units': _GetTestToUnitsMap(master_bot_pairs, table_entity.tests),
|
| 'revisions': revisions,
|
| 'categories': _GetCategoryCounts(json.loads(table_entity.table_layout)),
|
| }))
|
| @@ -129,31 +130,6 @@ def _CheckRevisions(rev_a, rev_b):
|
| # TODO(jessimb): Check if r_commit_pos (if clank), if so return revision.
|
| return rev_a, rev_b
|
|
|
| -def _ExpandTests(tests):
|
| - """Expand _* to _max, _std, _avg, and _count.
|
| -
|
| - Because users should specify _* for their tests, this will find and replace
|
| - with all necessary test paths. Note, if the test path is invalid, GetRow will
|
| - evaluate to 0. If no _* is supplied, an empty list is returned.
|
| -
|
| - Args:
|
| - tests: The table_config supplied list of tests.
|
| -
|
| - Returns:
|
| - The list of expanded tests (may be empty).
|
| - """
|
| - expanded_tests = []
|
| - for test in tests:
|
| - max_test = test.replace('_*', '_max')
|
| - std_test = test.replace('_*', '_std')
|
| - avg_test = test.replace('_*', '_avg')
|
| - count_test = test.replace('_*', '_count')
|
| - expanded_tests.append(max_test)
|
| - expanded_tests.append(std_test)
|
| - expanded_tests.append(avg_test)
|
| - expanded_tests.append(count_test)
|
| - return expanded_tests
|
| -
|
| def _GetCategoryCounts(layout):
|
| """Returns a dict of categories: # of times a test is in that category."""
|
| categories = {}
|
|
|