[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4aeb0bde936bac34230849495f49174e742ae202
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 07:05:28 2010 +0000

    2010-07-27  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            https://bugs.webkit.org/show_bug.cgi?id=42956
            [DRT/Chromium] Fix "out of sync" assertion error
    
            Fix an assertion error on Windows like the following:
            100721 20:16:46 chromium.py:386  CRITICAL Test got out of sync:
            |file:///c:/WebKitBuildSlave2/chromium-win-release-tests/build/LayoutTests/http/tests/local/blob/send-data-blob.html|
            |file:///C:/WebKitBuildSlave2/chromium-win-release-tests/build/LayoutTests/http/tests/local/blob/send-data-blob.html|
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
            If the url matches with "file:///[a-z]:", does case-ignore comparison.
            GURL capitalize the driver letter of a file: URL.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eb75ca5..08ab61f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-27  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42956
+        [DRT/Chromium] Fix "out of sync" assertion error
+
+        Fix an assertion error on Windows like the following:
+        100721 20:16:46 chromium.py:386  CRITICAL Test got out of sync:
+        |file:///c:/WebKitBuildSlave2/chromium-win-release-tests/build/LayoutTests/http/tests/local/blob/send-data-blob.html|
+        |file:///C:/WebKitBuildSlave2/chromium-win-release-tests/build/LayoutTests/http/tests/local/blob/send-data-blob.html|
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        If the url matches with "file:///[a-z]:", does case-ignore comparison.
+        GURL capitalize the driver letter of a file: URL.
+
 2010-07-26  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index e7f9ac8..b67df4b 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -34,6 +34,7 @@ from __future__ import with_statement
 import codecs
 import logging
 import os
+import re
 import shutil
 import signal
 import subprocess
@@ -382,9 +383,12 @@ class ChromiumDriver(base.Driver):
             if line.startswith("#URL:"):
                 actual_uri = line.rstrip()[5:]
                 if uri != actual_uri:
-                    _log.fatal("Test got out of sync:\n|%s|\n|%s|" %
-                               (uri, actual_uri))
-                    raise AssertionError("test out of sync")
+                    # GURL capitalizes the drive letter of a file URL.
+                    if (not re.search("^file:///[a-z]:", uri) or
+                        uri.tolower() != actual_uri.tolower()):
+                        _log.fatal("Test got out of sync:\n|%s|\n|%s|" %
+                                   (uri, actual_uri))
+                        raise AssertionError("test out of sync")
             elif line.startswith("#MD5:"):
                 actual_checksum = line.rstrip()[5:]
             elif line.startswith("#TEST_TIMED_OUT"):

-- 
WebKit Debian packaging