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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f5126e3dbf50ce60ae2296eea1480b46e072a471
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 07:52:36 2010 +0000

    2010-10-01  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            http/tests/navigation/ping-same-origin.html is flaky
            https://bugs.webkit.org/show_bug.cgi?id=46961
    
            This test fails by forgetting to print out the REQUEST_METHOD:
    
            http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r68727%20(18470)/http/tests/navigation/ping-same-origin-pretty-diff.html
    
            The only way this makes sense is if the file isn't finished writing by
            the time it gets read.  This can happen because the reader is polling
            the file for existence (!) to decide whether to read it.
    
            This patch writes to a temporary location and then moves the finished
            bytes into the well-known location atomically.  I haven't verified that
            it fixes the flakiness, but it seems like a good bet.
    
            * http/tests/navigation/resources/save-ping.php:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 843a408..8addc26 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2010-10-01  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        http/tests/navigation/ping-same-origin.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=46961
+
+        This test fails by forgetting to print out the REQUEST_METHOD:
+
+        http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r68727%20(18470)/http/tests/navigation/ping-same-origin-pretty-diff.html
+
+        The only way this makes sense is if the file isn't finished writing by
+        the time it gets read.  This can happen because the reader is polling
+        the file for existence (!) to decide whether to read it.
+
+        This patch writes to a temporary location and then moves the finished
+        bytes into the well-known location atomically.  I haven't verified that
+        it fixes the flakiness, but it seems like a good bet.
+
+        * http/tests/navigation/resources/save-ping.php:
+
 2010-10-01  Vincent Scheib  <scheib at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/LayoutTests/http/tests/navigation/resources/save-ping.php b/LayoutTests/http/tests/navigation/resources/save-ping.php
index 589b97d..4d08278 100644
--- a/LayoutTests/http/tests/navigation/resources/save-ping.php
+++ b/LayoutTests/http/tests/navigation/resources/save-ping.php
@@ -1,5 +1,5 @@
 <?php
-$pingFile = fopen("ping.txt", 'w');
+$pingFile = fopen("ping.txt.tmp", 'w');
 $httpHeaders = $_SERVER;
 ksort($httpHeaders, SORT_STRING);
 foreach ($httpHeaders as $name => $value) {
@@ -7,4 +7,5 @@ foreach ($httpHeaders as $name => $value) {
         fwrite($pingFile, "$name: $value\n");
 }
 fclose($pingFile);
+rename("ping.txt.tmp", "ping.txt");
 ?>

-- 
WebKit Debian packaging