projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4a1a901)
http/tests/navigation/anchor-basic.html is flaky on Snow Leopard Release Bot
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Sep 2011 01:01:59 +0000 (01:01 +0000)
committertony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Sep 2011 01:01:59 +0000 (01:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=34222

Reviewed by Ryosuke Niwa.

Add waitUntilDone/notifyDone to eliminate flakiness on mac. Without it, the img onload handler
doesn't always run. Also reduce the multipart timeout (should help to unblock other http requests).

* http/tests/multipart/stop-crash-expected.txt:
* http/tests/multipart/stop-crash.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96174 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/http/tests/multipart/stop-crash-expected.txt patch | blob | history
LayoutTests/http/tests/multipart/stop-crash.html patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c05192e..9a4d580 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-09-27  Tony Chang  <tony@chromium.org>
+
+        http/tests/navigation/anchor-basic.html is flaky on Snow Leopard Release Bot
+        https://bugs.webkit.org/show_bug.cgi?id=34222
+
+        Reviewed by Ryosuke Niwa.
+
+        Add waitUntilDone/notifyDone to eliminate flakiness on mac. Without it, the img onload handler
+        doesn't always run. Also reduce the multipart timeout (should help to unblock other http requests).
+
+        * http/tests/multipart/stop-crash-expected.txt:
+        * http/tests/multipart/stop-crash.html:
+
 2011-09-27  Mihai Parparita  <mihaip@chromium.org>
 
         Chromium baselines for fast/multicol/float-paginate-empty-lines.html
diff --git a/LayoutTests/http/tests/multipart/stop-crash-expected.txt b/LayoutTests/http/tests/multipart/stop-crash-expected.txt
index d3d5f19..cbb1e29 100644 (file)
--- a/LayoutTests/http/tests/multipart/stop-crash-expected.txt
+++ b/LayoutTests/http/tests/multipart/stop-crash-expected.txt
@@ -3,3 +3,4 @@ Test for http://bugs.webkit.org/show_bug.cgi?id=13360 REGRESSION: Crash closing
 If WebKit does not assert or crash after the test, then it passed.
 
 
+PASS
diff --git a/LayoutTests/http/tests/multipart/stop-crash.html b/LayoutTests/http/tests/multipart/stop-crash.html
index 40d0ec2..879713f 100644 (file)
--- a/LayoutTests/http/tests/multipart/stop-crash.html
+++ b/LayoutTests/http/tests/multipart/stop-crash.html
@@ -1,12 +1,17 @@
 <html>
 <head>
     <script>
-        if (window.layoutTestController)
+        if (window.layoutTestController) {
             layoutTestController.dumpAsText();
+            layoutTestController.waitUntilDone();
+        }
 
         function firstPartLoaded()
         {
             window.stop();
+            document.getElementById("results").innerHTML = "PASS";
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
         }
     </script>
 </head>
@@ -18,6 +23,7 @@
     <p>
         If WebKit does not assert or crash after the test, then it passed.
     </p>
-    <img width=24 height=24 src="resources/multipart.php?interval=0&img1=2x2-green.png&img2=2x2-green.png&wait=10" onload="firstPartLoaded()">
+    <img width=24 height=24 src="resources/multipart.php?interval=0&img1=2x2-green.png&img2=2x2-green.png&wait=3" onload="firstPartLoaded()">
+    <p id="results"></p>
 </body>
 </html>
Domain: Web Framework / Uncategorized;