126119 2013-12-21 06:26:12 -0800 [GTK] Test /webkit2/WebKitWebResource/mime-type fails when run after /webkit2/WebKitWebView/resources 2013-12-21 06:37:40 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, Soup P2 Normal --- 1 cgarcia webkit-unassigned commit-queue danw gustavo mrobinson svillar oldest_to_newest 962243 0 cgarcia 2013-12-21 06:26:12 -0800 It works in the bots because /webkit2/WebKitWebView/resources is skipped. TEST: Programs/WebKit2APITests/TestResources... (pid=29650) /webkit2/WebKitWebView/resources: OK /webkit2/WebKitWebView/history-cache: OK /webkit2/WebKitWebResource/loading: OK /webkit2/WebKitWebResource/response: OK /webkit2/WebKitWebResource/mime-type: ** ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp:420:void testWebResourceMimeType(SingleResourceLoadTest*, gconstpointer): assertion failed (webkit_uri_response_get_mime_type(response) == "image/vnd.microsoft.icon"): ("" == "image/vnd.microsoft.icon") FAIL GTester: last random seed: R02Sbe744525dd8684ce8d2abbd37b41d1fe The problem is that when the blank.ico resource is loaded from the disk cache, the mime type is null, because the soup cache doesn't cache sniffed mime types. This doesn't happen when a resource is loaded form the memory cache, because the ResourceResponse is cached, not only the headers. I think the disk cache should also cache the sniffed content type, but that needs to be done in soup. For now we can workaround the issue in the unit test by making sure that resources that can be cached, also include the Content-Type header, this way the mime type won't be sniffed and it will be cached as a HTTP header in the disk cache. 962245 1 219849 cgarcia 2013-12-21 06:31:19 -0800 Created attachment 219849 Patch 962246 2 commit-queue 2013-12-21 06:32:29 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 962247 3 219849 mrobinson 2013-12-21 06:33:28 -0800 Comment on attachment 219849 Patch You are doing an awesome job fixing the unit tests as always! 962249 4 cgarcia 2013-12-21 06:35:29 -0800 (In reply to comment #3) > (From update of attachment 219849 [details]) > You are doing an awesome job fixing the unit tests as always! Thanks! I want to make sure unit tests are in a good shape so that we can use them to work on network process. 962250 5 cgarcia 2013-12-21 06:37:40 -0800 Committed r160965: <http://trac.webkit.org/changeset/160965> 219849 2013-12-21 06:31:19 -0800 2013-12-21 06:33:28 -0800 Patch wk2-sniffed-content-type.diff text/plain 3071 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZTMxYWMyLi4zMDg3ZDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTMtMTItMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIFRlc3QgL3dlYmtpdDIvV2ViS2l0V2ViUmVzb3VyY2UvbWltZS10 eXBlIGZhaWxzIHdoZW4gcnVuIGFmdGVyIC93ZWJraXQyL1dlYktpdFdlYlZpZXcvcmVzb3VyY2Vz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYxMTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHJv YmxlbSBpcyB0aGF0IHdoZW4gdGhlIGJsYW5rLmljbyByZXNvdXJjZSBpcyBsb2FkZWQgZnJvbSB0 aGUKKyAgICAgICAgZGlzayBjYWNoZSwgdGhlIG1pbWUgdHlwZSBpcyBudWxsLCBiZWNhdXNlIHRo ZSBzb3VwIGNhY2hlIGRvZXNuJ3QKKyAgICAgICAgY2FjaGUgc25pZmZlZCBtaW1lIHR5cGVzLiBU aGlzIGRvZXNuJ3QgaGFwcGVuIHdoZW4gYSByZXNvdXJjZSBpcworICAgICAgICBsb2FkZWQgZm9y bSB0aGUgbWVtb3J5IGNhY2hlLCBiZWNhdXNlIHRoZSBSZXNvdXJjZVJlc3BvbnNlIGlzCisgICAg ICAgIGNhY2hlZCwgbm90IG9ubHkgdGhlIGhlYWRlcnMuIEkgdGhpbmsgdGhlIGRpc2sgY2FjaGUg c2hvdWxkIGFsc28KKyAgICAgICAgY2FjaGUgdGhlIHNuaWZmZWQgY29udGVudCB0eXBlLCBidXQg dGhhdCBuZWVkcyB0byBiZSBkb25lIGluCisgICAgICAgIHNvdXAuIEZvciBub3cgd2UgY2FuIHdv cmthcm91bmQgdGhlIGlzc3VlIGluIHRoZSB1bml0IHRlc3QgYnkKKyAgICAgICAgbWFraW5nIHN1 cmUgdGhhdCByZXNvdXJjZXMgdGhhdCBjYW4gYmUgY2FjaGVkLCBhbHNvIGluY2x1ZGUgdGhlCisg ICAgICAgIENvbnRlbnQtVHlwZSBoZWFkZXIsIHRoaXMgd2F5IHRoZSBtaW1lIHR5cGUgd29uJ3Qg YmUgc25pZmZlZCBhbmQKKyAgICAgICAgaXQgd2lsbCBiZSBjYWNoZWQgYXMgYSBIVFRQIGhlYWRl ciBpbiB0aGUgZGlzayBjYWNoZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3Rz L1Rlc3RSZXNvdXJjZXMuY3BwOgorICAgICAgICAoc2VydmVyQ2FsbGJhY2spOiBBZGQgQ29udGVu dC1UeXBlIGhlYWRlciBmb3IgcmVzb3VyY2VzIHRoYXQgY2FuCisgICAgICAgIGJlIGNhY2hlZC4K KworMjAxMy0xMi0yMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKICAgICAgICAgUkVHUkVTU0lPTihyMTYwOTA5KTogW0dUS10gVGVzdHMgL3dlYmtpdDIvV2Vi S2l0V2ViVmlldy9kZWZhdWx0LW1lbnUgYW5kIC93ZWJraXQyL1dlYktpdFNldHRpbmdzL3dlYmtp dC1zZXR0aW5ncyBmYWlsCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjYxMTcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcAppbmRleCA5MTU1YTk2Li5hNTlmZTdjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVz b3VyY2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9U ZXN0UmVzb3VyY2VzLmNwcApAQCAtNjc3LDYgKzY3Nyw3IEBAIHN0YXRpYyB2b2lkIHNlcnZlckNh bGxiYWNrKFNvdXBTZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNo YXIqCiAgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL3N0eWxlLmNzcyIpKSB7CiAg ICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBT T1VQX01FTU9SWV9TVEFUSUMsIGtTdHlsZUNTUywgc3RybGVuKGtTdHlsZUNTUykpOwogICAgICAg ICBhZGRDYWNoZUhUVFBIZWFkZXJzVG9SZXNwb25zZShtZXNzYWdlKTsKKyAgICAgICAgc291cF9t ZXNzYWdlX2hlYWRlcnNfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsICJDb250ZW50 LVR5cGUiLCAidGV4dC9jc3MiKTsKICAgICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIv amF2YXNjcmlwdC5qcyIpKSB7CiAgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNz YWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIGtKYXZhc2NyaXB0LCBzdHJs ZW4oa0phdmFzY3JpcHQpKTsKICAgICAgICAgc291cF9tZXNzYWdlX2hlYWRlcnNfYXBwZW5kKG1l c3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsICJDb250ZW50LVR5cGUiLCAidGV4dC9qYXZhc2NyaXB0 Iik7CkBAIC02OTQsNiArNjk1LDcgQEAgc3RhdGljIHZvaWQgc2VydmVyQ2FsbGJhY2soU291cFNl cnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgY29uc3QgY2hhcioKICAgICAgICAg Z19maWxlX2dldF9jb250ZW50cyhmaWxlUGF0aC5nZXQoKSwgJmNvbnRlbnRzLCAmY29udGVudHNM ZW5ndGgsIDApOwogICAgICAgICBzb3VwX21lc3NhZ2VfYm9keV9hcHBlbmQobWVzc2FnZS0+cmVz cG9uc2VfYm9keSwgU09VUF9NRU1PUllfVEFLRSwgY29udGVudHMsIGNvbnRlbnRzTGVuZ3RoKTsK ICAgICAgICAgYWRkQ2FjaGVIVFRQSGVhZGVyc1RvUmVzcG9uc2UobWVzc2FnZSk7CisgICAgICAg IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9oZWFkZXJzLCAi Q29udGVudC1UeXBlIiwgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiIpOwogICAgIH0gZWxzZSBp ZiAoZ19zdHJfZXF1YWwocGF0aCwgIi9zaW1wbGUtc3R5bGUuY3NzIikpIHsKICAgICAgICAgc3Rh dGljIGNvbnN0IGNoYXIqIHNpbXBsZUNTUyA9CiAgICAgICAgICAgICAiYm9keSB7Igo=