Title: [98835] trunk/LayoutTests
- Revision
- 98835
- Author
- [email protected]
- Date
- 2011-10-30 19:50:30 -0700 (Sun, 30 Oct 2011)
Log Message
WebSocket: iframe in reload-crash.html reloads forever
https://bugs.webkit.org/show_bug.cgi?id=71098
Reviewed by Kent Tamura.
iframe in this test should not get reloaded more than once.
* http/tests/websocket/tests/hixie76/reload-crash.html:
Provide the value of reloadCount to the script in iframe.
* http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html:
Call location.reload() only if reloadCount is zero.
* http/tests/websocket/tests/hybi/reload-crash.html:
* http/tests/websocket/tests/hybi/resources/reload-crash-iframe.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (98834 => 98835)
--- trunk/LayoutTests/ChangeLog 2011-10-31 01:50:34 UTC (rev 98834)
+++ trunk/LayoutTests/ChangeLog 2011-10-31 02:50:30 UTC (rev 98835)
@@ -1,3 +1,19 @@
+2011-10-30 Yuta Kitamura <[email protected]>
+
+ WebSocket: iframe in reload-crash.html reloads forever
+ https://bugs.webkit.org/show_bug.cgi?id=71098
+
+ Reviewed by Kent Tamura.
+
+ iframe in this test should not get reloaded more than once.
+
+ * http/tests/websocket/tests/hixie76/reload-crash.html:
+ Provide the value of reloadCount to the script in iframe.
+ * http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html:
+ Call location.reload() only if reloadCount is zero.
+ * http/tests/websocket/tests/hybi/reload-crash.html:
+ * http/tests/websocket/tests/hybi/resources/reload-crash-iframe.html:
+
2011-10-30 Ryosuke Niwa <[email protected]>
Remove crash expectations from tests that have not been crashing on Chromium.
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/reload-crash.html (98834 => 98835)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/reload-crash.html 2011-10-31 01:50:34 UTC (rev 98834)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/reload-crash.html 2011-10-31 02:50:30 UTC (rev 98835)
@@ -18,13 +18,13 @@
document.iframeReady = function ()
{
if (reloadCount == 0)
- debug("PASS iframe is ready.");
- if (reloadCount == 1) {
- debug("PASS reloaded iframe while WebSocket is busy");
- finishJSTest();
- return;
- }
- reloadCount += 1;
+ debug("PASS iframe is ready.");
+ else if (reloadCount == 1) {
+ debug("PASS reloaded iframe while WebSocket is busy");
+ finishJSTest();
+ } else
+ testFailed("iframe should not get reloaded more than once. (reloadCount = " + reloadCount + ")");
+ return reloadCount++;
};
frameDiv = document.createElement("iframe");
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html (98834 => 98835)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html 2011-10-31 01:50:34 UTC (rev 98834)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html 2011-10-31 02:50:30 UTC (rev 98835)
@@ -6,9 +6,11 @@
<div id="description"></div>
<div id="console"></div>
<script type="text/_javascript_">
-parent.document.iframeReady();
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
-location.reload();
+var reloadCount = parent.document.iframeReady();
+if (!reloadCount) {
+ var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
+ location.reload();
+}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/reload-crash.html (98834 => 98835)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/reload-crash.html 2011-10-31 01:50:34 UTC (rev 98834)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/reload-crash.html 2011-10-31 02:50:30 UTC (rev 98835)
@@ -20,13 +20,13 @@
document.iframeReady = function ()
{
if (reloadCount == 0)
- debug("PASS iframe is ready.");
- if (reloadCount == 1) {
- debug("PASS reloaded iframe while WebSocket is busy");
- finishJSTest();
- return;
- }
- reloadCount += 1;
+ debug("PASS iframe is ready.");
+ else if (reloadCount == 1) {
+ debug("PASS reloaded iframe while WebSocket is busy");
+ finishJSTest();
+ } else
+ testFailed("iframe should not get reloaded more than once. (reloadCount = " + reloadCount + ")");
+ return reloadCount++;
};
frameDiv = document.createElement("iframe");
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/resources/reload-crash-iframe.html (98834 => 98835)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/resources/reload-crash-iframe.html 2011-10-31 01:50:34 UTC (rev 98834)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/resources/reload-crash-iframe.html 2011-10-31 02:50:30 UTC (rev 98835)
@@ -6,9 +6,11 @@
<div id="description"></div>
<div id="console"></div>
<script type="text/_javascript_">
-parent.document.iframeReady();
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/close-on-unload");
-location.reload();
+var reloadCount = parent.document.iframeReady();
+if (!reloadCount) {
+ var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/close-on-unload");
+ location.reload();
+}
</script>
</body>
</html>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
