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

mihaip at chromium.org mihaip at chromium.org
Wed Dec 22 16:14:23 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 082e57a4cc34bbad3dc6929025e4d80346681c51
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 20 00:05:27 2010 +0000

    2010-11-19  Mihai Parparita  <mihaip at chromium.org>
    
            Unreviewed Chromium expectations update.
    
            http/tests/loading/bad-server-subframe.html had chromium-win baselines
            that made it fail consistently on Windows and Linux. It should pass with
            the regular upstream baselines.
    
            * platform/chromium-win/http/tests/loading/bad-server-subframe-expected.txt: Removed.
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72447 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fc5aedb..acd7130 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-19  Mihai Parparita  <mihaip at chromium.org>
+
+        Unreviewed Chromium expectations update.
+
+        http/tests/loading/bad-server-subframe.html had chromium-win baselines
+        that made it fail consistently on Windows and Linux. It should pass with
+        the regular upstream baselines.
+
+        * platform/chromium-win/http/tests/loading/bad-server-subframe-expected.txt: Removed.
+        * platform/chromium/test_expectations.txt:
+
 2010-11-19  Julie Parent  <jparent at chromium.org>
 
         Not reviewed, adding TIMEOUT for inspector/styles-disable-then-delete.html.
diff --git a/LayoutTests/platform/chromium-win/http/tests/loading/bad-server-subframe-expected.txt b/LayoutTests/platform/chromium-win/http/tests/loading/bad-server-subframe-expected.txt
deleted file mode 100644
index 1193425..0000000
--- a/LayoutTests/platform/chromium-win/http/tests/loading/bad-server-subframe-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didCommitLoadForFrame
-frame "f1" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didReceiveTitle: Developer Tools - http://127.0.0.1:8000/loading/bad-scheme-subframe.html
-main frame - didReceiveTitle: Developer Tools - http://127.0.0.1:8000/loading/bad-server-subframe.html
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "f1" - didFailProvisionalLoadWithError
-main frame - didFinishLoadForFrame
-This is a test of load callbacks. It is only useful inside the regression test tool.
-It also assumes there is no web server running locally on port 54321.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 346b733..0061b93 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2340,7 +2340,6 @@ BUGWK38705 : http/tests/security/sandbox-inherit-to-initial-document-2.html = TE
 // WebKit roll 58791:58807
 BUG43319 MAC : transforms/2d/zoom-menulist.html = IMAGE PASS
 BUG43319 MAC : fast/forms/select-empty-option-height.html = TIMEOUT IMAGE PASS
-BUG43319 WIN LINUX : http/tests/loading/bad-server-subframe.html = TEXT PASS
 
 BUG43496 LINUX : svg/custom/repaint-stroke-width-changes.svg = IMAGE PASS
 BUG43497 MAC WIN : svg/custom/repaint-stroke-width-changes.svg = IMAGE PASS

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list