Changes the fallback order of Chromium win directories in the layout test for...

webkit/tools/layout_tests/layout_package/failure_finder.py

 # Copyright (c) 2006-2009 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.
 
 # TODO(gwilson): 1.  Change text differs to use external utils.
 #                2.  Change text_expectations parsing to existing
 #                    logic in layout_pagckage.test_expectations.
 
 import difflib
 import errno
@@ skipping 33 matching lines @@
 
 # Failure types as found in builder stdio.
 TEXT_DIFF_MISMATCH = "Text diff mismatch"
 IMAGE_MISMATCH = "Image mismatch"
 TEST_TIMED_OUT = "Test timed out"
 TEST_SHELL_CRASHED = "Test shell crashed"
 
 CHROMIUM_WIN = "chromium-win"
 CHROMIUM_WIN_XP = "chromium-win-xp"
 CHROMIUM_WIN_VISTA = "chromium-win-vista"
+CHROMIUM_WIN_7 = "chromium-win-7"
 CHROMIUM_MAC = "chromium-mac"
 CHROMIUM_LINUX = "chromium-linux"
 PLATFORM = "platform"
 LAYOUTTESTS = "LayoutTests"
 
 # These platform dirs must be in order of their precedence.
 # TODO(gwilson): This is not the same fallback order as test_shell.  This list
 # should be reversed, and we need to add detection for the type of OS that
 # the given builder is running.
 WEBKIT_MAC_PLATFORM_DIRS = ["mac-leopard", "mac-snowleopard", "mac"]
 WEBKIT_WIN_PLATFORM_DIRS = ["win", "mac"]
 CHROMIUM_MAC_PLATFORM_DIRS = [CHROMIUM_MAC]
-CHROMIUM_WIN_PLATFORM_DIRS = [CHROMIUM_WIN, CHROMIUM_WIN_XP, CHROMIUM_WIN_VISTA]
+CHROMIUM_WIN_PLATFORM_DIRS = [CHROMIUM_WIN_XP, CHROMIUM_WIN_VISTA,
+                              CHROMIUM_WIN_7, CHROMIUM_WIN]
 CHROMIUM_LINUX_PLATFORM_DIRS = [CHROMIUM_LINUX, CHROMIUM_WIN]
 
 ARCHIVE_URL_REGEX = "last.*change: (\d+)"
 BUILD_NAME_REGEX = "build name: ([^\s]*)"
 CHROMIUM_FILE_AGE_REGEX = '<br />\s*Modified\s*<em>.*</em> \((.*)\) by'
 TEST_PATH_REGEX = "[^\s]+?"
 FAILED_REGEX = ("ERROR (" + TEST_PATH_REGEX + ") failed:\s*"
                 "(" + TEXT_DIFF_MISMATCH + ")?\s*"
                 "(" + IMAGE_MISMATCH + ")?\s*"
                 "(" + TEST_TIMED_OUT + ")?\s*"
@@ skipping 743 matching lines @@
       localFile.write(webFile.read())
       webFile.close()
       localFile.close()
       os.chmod(local_filename, 0777)
     except urllib2.HTTPError:
       return None
     except urllib2.URLError:
       print "The url %s is malformed." % url
       return None
     return localFile.name