<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192729] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192729">192729</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-22 01:00:45 -0800 (Sun, 22 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Some unit tests fail when using the network process
https://bugs.webkit.org/show_bug.cgi?id=151490
Reviewed by Martin Robinson.
Run the soup server in a separate thread in TestResources test to
avoid deadlocks.
This fixes /webkit2/WebKitWebView/sync-request-on-max-conns and
/webkit2/WebKitWebResource/get-data when using the network process.
* TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
(beforeAll): Create the WebKitTestServer with ServerRunInThread flag.
* TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp:
(WebKitTestServer::WebKitTestServer): When ServerRunInThread is
present, create a WorkQueue to run the server.
(WebKitTestServer::run): Run the server in the work queue if it
has been created.
* TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h: Convert server
type into server options as flags.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServercpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServerh">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192728 => 192729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-22 08:53:56 UTC (rev 192728)
+++ trunk/Tools/ChangeLog 2015-11-22 09:00:45 UTC (rev 192729)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-11-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Some unit tests fail when using the network process
+ https://bugs.webkit.org/show_bug.cgi?id=151490
+
+ Reviewed by Martin Robinson.
+
+ Run the soup server in a separate thread in TestResources test to
+ avoid deadlocks.
+
+ This fixes /webkit2/WebKitWebView/sync-request-on-max-conns and
+ /webkit2/WebKitWebResource/get-data when using the network process.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
+ (beforeAll): Create the WebKitTestServer with ServerRunInThread flag.
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp:
+ (WebKitTestServer::WebKitTestServer): When ServerRunInThread is
+ present, create a WorkQueue to run the server.
+ (WebKitTestServer::run): Run the server in the work queue if it
+ has been created.
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h: Convert server
+ type into server options as flags.
+
+2015-11-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] ImageDiff should normalize the diff image
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151261
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp (192728 => 192729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2015-11-22 08:53:56 UTC (rev 192728)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2015-11-22 09:00:45 UTC (rev 192729)
</span><span class="lines">@@ -835,7 +835,7 @@
</span><span class="cx">
</span><span class="cx"> void beforeAll()
</span><span class="cx"> {
</span><del>- kServer = new WebKitTestServer();
</del><ins>+ kServer = new WebKitTestServer(WebKitTestServer::ServerOptions::ServerRunInThread);
</ins><span class="cx"> kServer->run(serverCallback);
</span><span class="cx">
</span><span class="cx"> ResourcesTest::add("WebKitWebView", "resources", testWebViewResources);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp (192728 => 192729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp 2015-11-22 08:53:56 UTC (rev 192728)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp 2015-11-22 09:00:45 UTC (rev 192729)
</span><span class="lines">@@ -21,13 +21,19 @@
</span><span class="cx"> #include "WebKitTestServer.h"
</span><span class="cx">
</span><span class="cx"> #include "TestMain.h"
</span><ins>+#include <wtf/Threading.h>
</ins><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx">
</span><del>-WebKitTestServer::WebKitTestServer(ServerType type)
</del><ins>+WebKitTestServer::WebKitTestServer(ServerOptions options)
</ins><span class="cx"> {
</span><ins>+ if (options & ServerRunInThread) {
+ WTF::initializeThreading();
+ m_queue = WorkQueue::create("WebKitTestServer");
+ }
+
</ins><span class="cx"> GUniquePtr<char> sslCertificateFile;
</span><span class="cx"> GUniquePtr<char> sslKeyFile;
</span><del>- if (type == ServerHTTPS) {
</del><ins>+ if (options & ServerHTTPS) {
</ins><span class="cx"> CString resourcesDir = Test::getResourcesDir();
</span><span class="cx"> sslCertificateFile.reset(g_build_filename(resourcesDir.data(), "test-cert.pem", NULL));
</span><span class="cx"> sslKeyFile.reset(g_build_filename(resourcesDir.data(), "test-key.pem", NULL));
</span><span class="lines">@@ -37,9 +43,10 @@
</span><span class="cx"> soup_address_resolve_sync(address.get(), 0);
</span><span class="cx">
</span><span class="cx"> m_soupServer = adoptGRef(soup_server_new(SOUP_SERVER_INTERFACE, address.get(),
</span><ins>+ SOUP_SERVER_ASYNC_CONTEXT, m_queue ? m_queue->runLoop().mainContext() : nullptr,
</ins><span class="cx"> SOUP_SERVER_SSL_CERT_FILE, sslCertificateFile.get(),
</span><span class="cx"> SOUP_SERVER_SSL_KEY_FILE, sslKeyFile.get(), nullptr));
</span><del>- m_baseURI = type == ServerHTTPS ? soup_uri_new("https://127.0.0.1/") : soup_uri_new("http://127.0.0.1/");
</del><ins>+ m_baseURI = options & ServerHTTPS ? soup_uri_new("https://127.0.0.1/") : soup_uri_new("http://127.0.0.1/");
</ins><span class="cx"> soup_uri_set_port(m_baseURI, soup_server_get_port(m_soupServer.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -50,8 +57,15 @@
</span><span class="cx">
</span><span class="cx"> void WebKitTestServer::run(SoupServerCallback serverCallback)
</span><span class="cx"> {
</span><del>- soup_server_run_async(m_soupServer.get());
- soup_server_add_handler(m_soupServer.get(), 0, serverCallback, 0, 0);
</del><ins>+ if (m_queue) {
+ m_queue->dispatch([this, serverCallback] {
+ soup_server_run_async(m_soupServer.get());
+ soup_server_add_handler(m_soupServer.get(), nullptr, serverCallback, nullptr, nullptr);
+ });
+ } else {
+ soup_server_run_async(m_soupServer.get());
+ soup_server_add_handler(m_soupServer.get(), nullptr, serverCallback, nullptr, nullptr);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CString WebKitTestServer::getURIForPath(const char* path)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h (192728 => 192729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h 2015-11-22 08:53:56 UTC (rev 192728)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h 2015-11-22 09:00:45 UTC (rev 192729)
</span><span class="lines">@@ -22,18 +22,20 @@
</span><span class="cx">
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><ins>+#include <wtf/WorkQueue.h>
</ins><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> class WebKitTestServer {
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- enum ServerType {
- ServerHTTP,
- ServerHTTPS
</del><ins>+ enum ServerOptions {
+ ServerHTTP = 0,
+ ServerHTTPS = 1 << 1,
+ ServerRunInThread = 1 << 2,
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- WebKitTestServer(ServerType = ServerHTTP);
</del><ins>+ WebKitTestServer(ServerOptions = ServerHTTP);
</ins><span class="cx"> virtual ~WebKitTestServer();
</span><span class="cx">
</span><span class="cx"> SoupURI* baseURI() { return m_baseURI; }
</span><span class="lines">@@ -44,6 +46,7 @@
</span><span class="cx"> private:
</span><span class="cx"> GRefPtr<SoupServer> m_soupServer;
</span><span class="cx"> SoupURI* m_baseURI;
</span><ins>+ RefPtr<WorkQueue> m_queue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // WebKitTestServer_h
</span></span></pre>
</div>
</div>
</body>
</html>