[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
yutak at chromium.org
yutak at chromium.org
Fri Jan 21 14:40:01 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit de50d6553f7b40caa3bbc1c3af035841cdbc2700
Author: yutak at chromium.org <yutak at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 24 04:50:00 2010 +0000
2010-12-22 Yuta Kitamura <yutak at chromium.org>
Reviewed by Alexey Proskuryakov.
[GTK] http/tests/inspector/console-websocket-error.html hangs
https://bugs.webkit.org/show_bug.cgi?id=51380
The test should call dumpConsoleMessages() even if WebSocket is not supported
or a WebSocket object goes to an unexpected state.
* http/tests/inspector/console-websocket-error.html:
* platform/gtk/Skipped:
* platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt:
* platform/mac/http/tests/inspector/console-websocket-error-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74611 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f666c50..a090279 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-22 Yuta Kitamura <yutak at chromium.org>
+
+ Reviewed by Alexey Proskuryakov.
+
+ [GTK] http/tests/inspector/console-websocket-error.html hangs
+ https://bugs.webkit.org/show_bug.cgi?id=51380
+
+ The test should call dumpConsoleMessages() even if WebSocket is not supported
+ or a WebSocket object goes to an unexpected state.
+
+ * http/tests/inspector/console-websocket-error.html:
+ * platform/gtk/Skipped:
+ * platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt:
+ * platform/mac/http/tests/inspector/console-websocket-error-expected.txt:
+
2010-12-23 Jan Erik Hanssen <jhanssen at sencha.com>
Reviewed by Adam Barth.
diff --git a/LayoutTests/http/tests/inspector/console-websocket-error.html b/LayoutTests/http/tests/inspector/console-websocket-error.html
index 4c0a019..ea4138e 100644
--- a/LayoutTests/http/tests/inspector/console-websocket-error.html
+++ b/LayoutTests/http/tests/inspector/console-websocket-error.html
@@ -8,6 +8,11 @@ var nextTestIndex = 0;
function doit()
{
+ if (!window.WebSocket) {
+ console.log("WebSocket is not supported.");
+ dumpConsoleMessages(false);
+ return;
+ }
doNextTest();
}
@@ -28,9 +33,11 @@ function testDNSLookup()
var ws = new WebSocket("ws://nonexistent.domain.invalid/"); // Network error should be logged to console.
ws.onopen = function() {
console.log("testDNSLookup: onopen is called.");
+ ws.close();
};
ws.onerror = function() {
console.log("testDNSLookup: onerror is called.");
+ ws.close();
};
ws.onclose = function() {
console.log("testDNSLookup: onclose is called.");
@@ -47,9 +54,11 @@ function testSSLCertificate()
var ws = new WebSocket("wss://127.0.0.1:8443/");
ws.onopen = function() {
console.log("testSSLCertificate: onopen is called.");
+ ws.close();
};
ws.onerror = function() {
console.log("testSSLCertificate: onerror is called.");
+ ws.close();
};
ws.onclose = function() {
console.log("testSSLCertificate: onclose is called.");
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 8febb89..fb27371 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5583,9 +5583,6 @@ fast/events/pageshow-pagehide-on-back-cached-with-frames.html
http/tests/local/link-stylesheet-load-order.html
http/tests/local/link-stylesheet-load-order-preload.html
-# https://bugs.webkit.org/show_bug.cgi?id=51380
-http/tests/inspector/console-websocket-error.html
-
# Passing just a username or just a password to
# layoutTestController.queueLoad() does not work
http/tests/xmlhttprequest/basic-auth-nouser.html
diff --git a/LayoutTests/platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt b/LayoutTests/platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt
index 8399386..a4a3d2e 100644
--- a/LayoutTests/platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt
+++ b/LayoutTests/platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt
@@ -1,13 +1,13 @@
-CONSOLE MESSAGE: line 27: testDNSLookup: Test started.
-CONSOLE MESSAGE: line 36: testDNSLookup: onclose is called.
-CONSOLE MESSAGE: line 43: testSSLCertificate: Test started.
-CONSOLE MESSAGE: line 55: testSSLCertificate: onclose is called.
+CONSOLE MESSAGE: line 32: testDNSLookup: Test started.
+CONSOLE MESSAGE: line 43: testDNSLookup: onclose is called.
+CONSOLE MESSAGE: line 50: testSSLCertificate: Test started.
+CONSOLE MESSAGE: line 64: testSSLCertificate: onclose is called.
WebSocket's network errors should be logged to console.
-console-websocket-error.html:27testDNSLookup: Test started.
+console-websocket-error.html:32testDNSLookup: Test started.
ws://nonexistent.domain.invalid:80/WebSocket network error: Operation could not be completed. (kCFErrorDomainCFNetwork error 2.)
-console-websocket-error.html:36testDNSLookup: onclose is called.
-console-websocket-error.html:43testSSLCertificate: Test started.
+console-websocket-error.html:43testDNSLookup: onclose is called.
+console-websocket-error.html:50testSSLCertificate: Test started.
wss://127.0.0.1:8443/WebSocket network error: OSStatus Error -9812: valid cert chain, untrusted root
-console-websocket-error.html:55testSSLCertificate: onclose is called.
+console-websocket-error.html:64testSSLCertificate: onclose is called.
diff --git a/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt b/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt
index 07d1e04..aaf7cf2 100644
--- a/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt
+++ b/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt
@@ -1,13 +1,13 @@
-CONSOLE MESSAGE: line 27: testDNSLookup: Test started.
-CONSOLE MESSAGE: line 36: testDNSLookup: onclose is called.
-CONSOLE MESSAGE: line 43: testSSLCertificate: Test started.
-CONSOLE MESSAGE: line 55: testSSLCertificate: onclose is called.
+CONSOLE MESSAGE: line 32: testDNSLookup: Test started.
+CONSOLE MESSAGE: line 43: testDNSLookup: onclose is called.
+CONSOLE MESSAGE: line 50: testSSLCertificate: Test started.
+CONSOLE MESSAGE: line 64: testSSLCertificate: onclose is called.
WebSocket's network errors should be logged to console.
-console-websocket-error.html:27testDNSLookup: Test started.
+console-websocket-error.html:32testDNSLookup: Test started.
ws://nonexistent.domain.invalid:80/WebSocket network error: The operation couldn’t be completed. (kCFErrorDomainCFNetwork error 2.)
-console-websocket-error.html:36testDNSLookup: onclose is called.
-console-websocket-error.html:43testSSLCertificate: Test started.
+console-websocket-error.html:43testDNSLookup: onclose is called.
+console-websocket-error.html:50testSSLCertificate: Test started.
wss://127.0.0.1:8443/WebSocket network error: OSStatus Error -9812: valid cert chain, untrusted root
-console-websocket-error.html:55testSSLCertificate: onclose is called.
+console-websocket-error.html:64testSSLCertificate: onclose is called.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list