Changeset 83554 in webkit

Timestamp:

Apr 11, 2011 8:57:41 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-11 Xianzhu Wang <​wangxianzhu@google.com>

Reviewed by Tony Gentilcore.

loader/reload-subresource-when-type-changes.html might be flaky
​https://bugs.webkit.org/show_bug.cgi?id=56360

Onload of the third image might be triggered before that of the second image.
This might ahppen in environment with slow access (such as NFS, or tests
accessed through HTTP).

• loader/reload-subresource-when-type-changes.html:
• loader/resources/reload-subresource-when-type-changes.js:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• loader/reload-subresource-when-type-changes.html (modified) (1 diff)
• loader/resources/reload-subresource-when-type-changes.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-11  Xianzhu Wang  <wangxianzhu@google.com>
+
+        Reviewed by Tony Gentilcore.
+
+        loader/reload-subresource-when-type-changes.html might be flaky
+        https://bugs.webkit.org/show_bug.cgi?id=56360
+
+        Onload of the third image might be triggered before that of the second image.
+        This might ahppen in environment with slow access (such as NFS, or tests
+        accessed through HTTP).
+
+        * loader/reload-subresource-when-type-changes.html:
+        * loader/resources/reload-subresource-when-type-changes.js:
+
 2011-04-11  Sam Weinig  <sam@webkit.org>
 

trunk/LayoutTests/loader/reload-subresource-when-type-changes.html

@@ -17 +17 @@
 }
 
+var loaded = 0;
+var messages = [];
+
 function checkLoadedImage(event, testNumber) {
     var imageWidth = event.target.width;
     if (imageWidth == 25)
-        log("PASS " + testNumber + " of 3");
+        resourceLoaded("PASS ", testNumber);
     else
-        log("IMAGE SIZE " + imageWidth + " FAIL - " + testNumber + " of 2");
+        resourceLoaded("IMAGE SIZE " + imageWidth + " FAIL - ", testNumber);
+}
+
+function resourceLoaded(message, testNumber) {
+    messages[testNumber] = message + testNumber + " of 3";
+    if (++loaded == 3) {
+        for (var i = 1; i <= 3; i++)
+            log(messages[i]);
+    }
 }
 </script>

trunk/LayoutTests/loader/resources/reload-subresource-when-type-changes.js

@@ -1 +1 @@
 clearLog();
-log("PASS 1 of 3");
+resourceLoaded("PASS ", 1);