Title: [90604] trunk/LayoutTests
- Revision
- 90604
- Author
- [email protected]
- Date
- 2011-07-07 17:49:40 -0700 (Thu, 07 Jul 2011)
Log Message
WebSocket: Use jsTestIsAsync and finishJSTest() in httponly-cookie.pl
https://bugs.webkit.org/show_bug.cgi?id=64087
Reviewed by Kent Tamura.
* http/tests/websocket/tests/hixie76/httponly-cookie.pl:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (90603 => 90604)
--- trunk/LayoutTests/ChangeLog 2011-07-08 00:17:24 UTC (rev 90603)
+++ trunk/LayoutTests/ChangeLog 2011-07-08 00:49:40 UTC (rev 90604)
@@ -1,3 +1,12 @@
+2011-07-07 Yuta Kitamura <[email protected]>
+
+ WebSocket: Use jsTestIsAsync and finishJSTest() in httponly-cookie.pl
+ https://bugs.webkit.org/show_bug.cgi?id=64087
+
+ Reviewed by Kent Tamura.
+
+ * http/tests/websocket/tests/hixie76/httponly-cookie.pl:
+
2011-07-07 James Robinson <[email protected]>
[chromium] Add text baseline for spanOverlapsCanvas
Modified: trunk/LayoutTests/http/tests/websocket/tests/hixie76/httponly-cookie.pl (90603 => 90604)
--- trunk/LayoutTests/http/tests/websocket/tests/hixie76/httponly-cookie.pl 2011-07-08 00:17:24 UTC (rev 90603)
+++ trunk/LayoutTests/http/tests/websocket/tests/hixie76/httponly-cookie.pl 2011-07-08 00:49:40 UTC (rev 90604)
@@ -9,17 +9,13 @@
<html>
<head>
<script src=""
-<script src=""
</head>
<body>
<p>Test WebSocket sends HttpOnly cookies.</p>
<p>On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".</p>
<div id="console"></div>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
+window.jsTestIsAsync = true;
var cookie;
@@ -30,15 +26,6 @@
return cookie.split('; ').sort().join('; ');
}
-function endTest()
-{
- cookie = normalizeCookie(cookie);
- shouldBe("cookie", '"WK-websocket-test-httponly=1; WK-websocket-test=1"');
- isSuccessfullyParsed();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
-}
-
var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo-cookie");
ws._onopen_ = function() {
debug("WebSocket open");
@@ -49,11 +36,14 @@
};
ws._onclose_ = function() {
debug("WebSocket closed");
- endTest();
+ cookie = normalizeCookie(cookie);
+ shouldBe("cookie", '"WK-websocket-test-httponly=1; WK-websocket-test=1"');
+ finishJSTest();
};
var successfullyParsed = true;
</script>
+<script src=""
</body>
</html>
HTML
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
