Fix layout test analyzer post the move to blink and updates to TestExpectations.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/19477002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214262 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 19 deletions

diff --git a/media/tools/layout_tests/layouttest_analyzer_helpers.py b/media/tools/layout_tests/layouttest_analyzer_helpers.py
index cbcf79c..2eb3c15 100644
--- a/media/tools/layout_tests/layouttest_analyzer_helpers.py
+++ b/media/tools/layout_tests/layouttest_analyzer_helpers.py
@@ -15,15 +15,17 @@ import smtplib
 import socket
 import sys
 import time
-import urllib
 
 from bug import Bug
 from test_expectations_history import TestExpectationsHistory
 
-DEFAULT_TEST_EXPECTATION_PATH = ('trunk/LayoutTests/platform/chromium/'
-    'TestExpectations')
-LEGACY_DEFAULT_TEST_EXPECTATION_PATH = ('trunk/LayoutTests/platform/chromium/'
-    'test_expectations.txt')
+DEFAULT_TEST_EXPECTATION_PATH = ('trunk/LayoutTests/TestExpectations')
+LEGACY_DEFAULT_TEST_EXPECTATION_PATH = (
+    'trunk/LayoutTests/platform/chromium/test_expectations.txt')
+REVISION_LOG_URL = ('http://build.chromium.org/f/chromium/perf/dashboard/ui/'
+    'changelog_blink.html?url=/trunk/LayoutTests/%s&range=%d:%d')
+DEFAULT_REVISION_VIEW_URL = 'http://src.chromium.org/viewvc/blink?revision=%s'
+
 
 class AnalyzerResultMap:
   """A class to deal with joined result produed by the analyzer.
@@ -193,15 +195,12 @@ class AnalyzerResultMap:
       issues_txt += '\n'
     return stats, issues_txt
 
-  def ConvertToString(self, prev_time, diff_map, bug_anno_map,
-                      issue_detail_mode):
+  def ConvertToString(self, prev_time, diff_map, issue_detail_mode):
     """Convert this result to HTML display for email.
 
     Args:
       prev_time: the previous time string that are compared against.
       diff_map: the compared map generated by |CompareResultMaps()|.
-      bug_anno_map: a annotation map where keys are bug names and values are
-          annotations for the bug.
       issue_detail_mode: includes the issue details in the output string if
           this is True.
 
@@ -227,11 +226,7 @@ class AnalyzerResultMap:
       return_str += '<b>Current issues about failing non-skipped tests:</b>'
       for (bug_txt, test_info_list) in (
           self.GetListOfBugsForNonSkippedTests().iteritems()):
-        if not bug_txt in bug_anno_map:
-          bug_anno_map[bug_txt] = ''
-        else:
-          bug_anno_map[bug_txt] = '(' + bug_anno_map[bug_txt] + ')'
-        return_str += '<ul>%s %s' % (Bug(bug_txt), bug_anno_map[bug_txt])
+        return_str += '<ul>%s' % Bug(bug_txt)
         for test_info in test_info_list:
           (test_name, te_info) = test_info
           gpu_link = ''
@@ -324,7 +319,7 @@ class AnalyzerResultMap:
 
 
 def SendStatusEmail(prev_time, analyzer_result_map, diff_map,
-                    bug_anno_map, receiver_email_address, test_group_name,
+                    receiver_email_address, test_group_name,
                     appended_text_to_email, email_content, rev_str,
                     email_only_change_mode):
   """Send status email.
@@ -346,8 +341,6 @@ def SendStatusEmail(prev_time, analyzer_result_map, diff_map,
          This means that current result has 'foo1.html' but it is NOT in the
          previous result. This also means the previous result has 'foo2.html'
          but it is NOT in the current result.
-    bug_anno_map: bug annotation map where bug name and annotations are
-        stored.
     receiver_email_address: receiver's email address.
     test_group_name: string representing the test group name (e.g., 'media').
     appended_text_to_email: a text which is appended at the end of the status
@@ -423,8 +416,7 @@ def GetRevisionString(prev_time, current_time, diff_map):
       if old_rev < 119317:
         old_path = LEGACY_DEFAULT_TEST_EXPECTATION_PATH
 
-      link = 'http://trac.webkit.org/changeset?new=%d@%s&old=%d@%s' % (new_rev,
-          new_path, old_rev, old_path)
+      link = REVISION_LOG_URL % (new_path, old_rev, new_rev)
       rev_str += '<ul><a href="%s">%s->%s</a>\n' % (link, old_rev, new_rev)
       simple_rev_str = '<a href="%s">%s->%s</a>,' % (link, old_rev, new_rev)
       rev_str += '<li>%s</li>\n' % author