[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5de2adcd0fc50b4f7fd7d64008504e5030a7aac2
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 12:10:48 2010 +0000

    2010-03-16  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            [GStreamer] media/video-played-collapse.html
            https://bugs.webkit.org/show_bug.cgi?id=36165
    
            Skip apparently unreliable test. It used to fail locally and pass
            on the bots, but the situation is inversed now. We need to
            investigate this properly.
    
            * platform/gtk/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bda7ba3..17c9744 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-16  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        [GStreamer] media/video-played-collapse.html
+        https://bugs.webkit.org/show_bug.cgi?id=36165
+
+        Skip apparently unreliable test. It used to fail locally and pass
+        on the bots, but the situation is inversed now. We need to
+        investigate this properly.
+
+        * platform/gtk/Skipped:
+
 2010-03-16  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 75dea0d..67a7913 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5839,3 +5839,12 @@ fast/events/spatial-navigation/snav-iframe-with-offscreen-focusable-element.html
 # Needs mock support, and build slave Geolocation service
 # See https://bugs.webkit.org/show_bug.cgi?id=36053
 fast/dom/Geolocation/maximum-age.html
+
+# As explained in https://bugs.webkit.org/show_bug.cgi?id=34372 this
+# test seems to suffer from a race condition that just turned to the
+# failing side with the normalization of priorities; it used to fail
+# consistently for me locally (kov at webkit.org), and now passes from
+# time to time, but the situation is inversed in the bot, so I'm
+# skipping it.
+# See also https://bugs.webkit.org/show_bug.cgi?id=36165
+media/video-played-collapse.html

-- 
WebKit Debian packaging