[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
ap at apple.com
ap at apple.com
Wed Jan 20 22:17:59 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit b04a7f73db3e5a732986118cb5dc4c671cea49ce
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 8 23:53:12 2010 +0000
Reviewed by Eric Seidel.
https://bugs.webkit.org/show_bug.cgi?id=33279
fast/websockets/websocket-event-target.html causes any test after it to fail
* fast/websockets/script-tests/websocket-event-target.js: The test uses an HTTP server
URL to create a WebSocket, so an error may be logged to console when detected (this is
timing dependent).
* platform/mac/Skipped: Removed the test from Skipped list.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53019 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 34c0d5b..ff7960d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-08 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by Eric Seidel.
+
+ https://bugs.webkit.org/show_bug.cgi?id=33279
+ fast/websockets/websocket-event-target.html causes any test after it to fail
+
+ * fast/websockets/script-tests/websocket-event-target.js: The test uses an HTTP server
+ URL to create a WebSocket, so an error may be logged to console when detected (this is
+ timing dependent).
+
+ * platform/mac/Skipped: Removed the test from Skipped list.
+
2010-01-08 Beth Dakin <bdakin at apple.com>
Reviewed by Oliver Hunt.
diff --git a/LayoutTests/fast/websockets/script-tests/websocket-event-target.js b/LayoutTests/fast/websockets/script-tests/websocket-event-target.js
index a6f25af..b01df6d 100644
--- a/LayoutTests/fast/websockets/script-tests/websocket-event-target.js
+++ b/LayoutTests/fast/websockets/script-tests/websocket-event-target.js
@@ -1,6 +1,7 @@
description("Make sure WebSocket object acts as EventTarget.");
var ws = new WebSocket("ws://localhost:8000");
+ws.close(); // That is not a WebSocket server, prevent logging an error to console.
var open_event_handled = false;
var message_event_handled = false;
var close_event_handled = false;
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 421b17d..f73d7f9 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -95,7 +95,3 @@ media/media-can-play-ogg.html
# This test requires touch support
fast/events/basic-touch-events.html
-
-# This test is causing a log message to occur after the test, thus causing the next test after it to fail:
-# https://bugs.webkit.org/show_bug.cgi?id=33256
-fast/websockets/websocket-event-target.html
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list