Update tools to reflect movement of TestExpectations

media/tools/layout_tests/test_expectations_history.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A module for the history of the test expectation file."""
 
 from datetime import datetime
 from datetime import timedelta
 
 import re
 import sys
 import time
 import pysvn
 
-# Default Webkit SVN location for chromium test expectation file.
+TEST_EXPECTATIONS_ROOT = 'http://src.chromium.org/blink/trunk/'
+# A map from earliest revision to path.
 # TODO(imasaki): support multiple test expectation files.
-DEFAULT_TEST_EXPECTATION_LOCATION = (
-    'http://svn.webkit.org/repository/webkit/trunk/'
-    'LayoutTests/platform/chromium/TestExpectations')
-LEGACY_TEST_EXPECTATION_LOCATION = (
-    'http://svn.webkit.org/repository/webkit/trunk/'
-    'LayoutTests/platform/chromium/test_expectations.txt')
+TEST_EXPECTATIONS_LOCATIONS = {
+    148348: 'LayoutTests/TestExpectations',
+    119317: 'LayoutTests/platform/chromium/TestExpectations',
+    0: 'LayoutTests/platform/chromium/test_expectations.txt'}
+TEST_EXPECTATIONS_DEFAULT_PATH = (
+    TEST_EXPECTATIONS_ROOT + TEST_EXPECTATIONS_LOCATIONS[148348])
 
 class TestExpectationsHistory(object):
   """A class to represent history of the test expectation file.
 
   The history is obtained by calling PySVN.log()/diff() APIs.
 
   TODO(imasaki): Add more functionalities here like getting some statistics
       about the test expectation file.
   """
 
   @staticmethod
+  def GetTestExpectationsPathForRevision(revision):
+    for i in sorted(TEST_EXPECTATIONS_LOCATIONS.keys(), reverse=True):
+      if revision >= i:
+        return TEST_EXPECTATIONS_ROOT + TEST_EXPECTATIONS_LOCATIONS[i]
+
+  @staticmethod
   def GetDiffBetweenTimes(start, end, testname_list,
-                          te_location=DEFAULT_TEST_EXPECTATION_LOCATION):
+                          te_location=TEST_EXPECTATIONS_DEFAULT_PATH):
     """Get difference between time period for the specified test names.
 
     Given the time period, this method first gets the revision number. Then,
     it gets the diff for each revision. Finally, it keeps the diff relating to
     the test names and returns them along with other information about
     revision.
 
     Args:
       start: A timestamp specifying start of the time period to be
           looked at.
@@ skipping 34 matching lines @@
         # Prepend at the beginning of logs.
         logs.insert(0, logs_before_time_period[len(logs_before_time_period)-1])
         break
       gobackdays *= 2
 
     for i in xrange(len(logs) - 1):
       old_rev = logs[i].revision.number
       new_rev = logs[i + 1].revision.number
       # Parsing the actual diff.
 
-      # test_expectations.txt was renamed to TestExpectations at r119317.
-      new_path = DEFAULT_TEST_EXPECTATION_LOCATION
-      if new_rev < 119317:
-        new_path = LEGACY_TEST_EXPECTATION_LOCATION
-      old_path = DEFAULT_TEST_EXPECTATION_LOCATION
-      if old_rev < 119317:
-        old_path = LEGACY_TEST_EXPECTATION_LOCATION
+      new_path = TestExpectationsHistory.GetTestExpectationsPathForRevision(
+          new_rev);
+      old_path = TestExpectationsHistory.GetTestExpectationsPathForRevision(
+          old_rev);
 
       text = client.diff('/tmp',
                          url_or_path=old_path,
                          revision1=pysvn.Revision(
                              pysvn.opt_revision_kind.number, old_rev),
                          url_or_path2=new_path,
                          revision2=pysvn.Revision(
                              pysvn.opt_revision_kind.number, new_rev))
       lines = text.split('\n')
       target_lines = []
       for line in lines:
         for testname in testname_list:
           matches = re.findall(testname, line)
           if matches:
             if line[0] == '+' or line[0] == '-':
               target_lines.append(line)
       if target_lines:
         # Needs to convert to normal date string for presentation.
         result_list.append((
             old_rev, new_rev, logs[i + 1].author,
             datetime.fromtimestamp(
                 logs[i + 1].date).strftime('%Y-%m-%d %H:%M:%S'),
             logs[i + 1].message, target_lines))
     return result_list