WebKitTestRunner needs to print frame load delegate information
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Sep 2012 12:00:20 +0000 (12:00 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Sep 2012 12:00:20 +0000 (12:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=42705

Patch by Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> on 2012-09-21
Reviewed by Kenneth Rohde Christiansen.

Tools:

Added missing dumping from WTR::InjectedBundlePage::didFailLoadWithErrorForFrame.

* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didFailLoadWithErrorForFrame):

LayoutTests:

Unskipped corresponding test cases from wk2/Skipped, put those which still fail to an appropriate
group in wk2/Skipped.
Moved couple of http/tests/loading tests from platform/efl-wk1/TestExpectations to
platform/efl/TestExpectations as they actually fail for both WK1 EFL and WK2 EFL.

* platform/efl-wk1/TestExpectations:
* platform/efl/TestExpectations:
* platform/wk2/Skipped:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@129213 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/efl-wk1/TestExpectations
LayoutTests/platform/efl/TestExpectations
LayoutTests/platform/wk2/Skipped
Tools/ChangeLog
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

index 15f959d78a53aa1eb264e720a8d9e7149d58f052..33d5eb4eab18c5dd6034916a109b09281eb13564 100644 (file)
@@ -1,3 +1,19 @@
+2012-09-21  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        WebKitTestRunner needs to print frame load delegate information
+        https://bugs.webkit.org/show_bug.cgi?id=42705
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Unskipped corresponding test cases from wk2/Skipped, put those which still fail to an appropriate
+        group in wk2/Skipped.
+        Moved couple of http/tests/loading tests from platform/efl-wk1/TestExpectations to
+        platform/efl/TestExpectations as they actually fail for both WK1 EFL and WK2 EFL.
+
+        * platform/efl-wk1/TestExpectations:
+        * platform/efl/TestExpectations:
+        * platform/wk2/Skipped:
+
 2012-09-21  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL] EventSender should mimic CTRL+o emacs shortcut
index 3d54b5b0774d1c5ca7707ceec18f856bc8c16dcf..5df622e7d630109e17b09642f63d91eb821dd8f8 100644 (file)
@@ -100,10 +100,6 @@ webkit.org/b/87088 fast/js/names.html [ Failure ]
 # Failing after 125592
 webkit.org/b/94194 http/tests/security/frameNavigation/inactive-function-in-popup-navigate-child.html [ Failure ]
 
-# Fail after r128393.
-webkit.org/b/96620 http/tests/loading/pdf-commit-load-callbacks.html [ Failure ]
-webkit.org/b/96620 http/tests/loading/text-content-type-with-binary-extension.html [ Failure ]
-
 # EFL's LayoutTestController does not implement setTabKeyCyclesThroughElements.
 webkit.org/b/82864 fast/events/keypress-insert-tab.html [ Failure ]
 
index 393fd1d10f64177530fbaa9a8d4e260dab3f2e4b..515be345d829aabfcef601eb73dacd9e132e6138 100644 (file)
@@ -1062,4 +1062,7 @@ webkit.org/b/96517 fast/events/popup-blocking-timers.html [ Failure ]
 # Fails after r129175.
 webkit.org/b/97296 fast/text/international/hebrew-selection.html [ ImageOnlyFailure ]
 
+# Fail after r128393.
+webkit.org/b/96620 http/tests/loading/pdf-commit-load-callbacks.html [ Failure ]
+webkit.org/b/96620 http/tests/loading/text-content-type-with-binary-extension.html [ Failure ]
 
index 1917b6cefb3799ebdad3e980f3576816d84d0311..9bcbb112c182d7acbf5dc1a963345e38465e610f 100644 (file)
@@ -470,25 +470,6 @@ http/tests/globalhistory/history-delegate-basic-refresh-redirect.html
 http/tests/globalhistory/history-delegate-basic-title.html
 http/tests/globalhistory/history-delegate-basic-visited-links.html
 
-# WebKitTestRunner needs to print frame load delegate information
-# <https://bugs.webkit.org/show_bug.cgi?id=42705>
-fast/loader/subframe-removes-itself.html
-http/tests/loading/bad-scheme-subframe.html
-http/tests/loading/bad-server-subframe.html
-http/tests/loading/basic.html
-http/tests/loading/deleted-host-in-resource-load-delegate-callback.html
-http/tests/loading/empty-subframe.html
-http/tests/loading/load-javascript-after-many-xhrs.html
-http/tests/loading/location-hash-reload-cycle.html
-http/tests/loading/nested_bad_objects.php
-http/tests/loading/onload-vs-immediate-refresh.pl
-http/tests/loading/preload-img-test.html
-http/tests/loading/redirect-with-no-location-crash.html
-http/tests/loading/simple-subframe.html
-http/tests/loading/slow-parsing-subframe.html
-http/tests/loading/text-content-type-with-binary-extension.html
-http/tests/loading/state-object-security-exception.html
-
 # These tests crash the WebProcess when run under WebKitTestRunner.
 # <https://bugs.webkit.org/show_bug.cgi?id=44479>
 fast/parser/remove-misnested-iframe-in-beforeload.html
@@ -844,6 +825,11 @@ webarchive/loading/cache-expired-subresource.html
 webarchive/loading/test-loading-archive.html
 webarchive/loading/test-loading-archive-subresource-null-mimetype.html
 
+# Should pass now on ports other than EFL and GTK.
+# But it needs to be checked first.
+http/tests/loading/bad-scheme-subframe.html
+http/tests/loading/text-content-type-with-binary-extension.html
+
 # Some elements are skipped when focus is moved.
 fast/spatial-navigation/snav-container-white-space.html
 fast/spatial-navigation/snav-div-overflow-scrol-hidden.html
@@ -859,6 +845,9 @@ http/tests/download
 # WebFrameLoaderClient::canHandleRequest() has to be implemented.
 http/tests/misc/redirect-to-external-url.html
 
+# WebKitTestRunner needs testRunner.dispatchPendingLoadRequests
+http/tests/loading/deleted-host-in-resource-load-delegate-callback.html
+
 ### END OF (2) Classified failures without bug reports (yet)
 ########################################
 
index 19710d1389f2e5fee07677a90a32251a57bbe924..c260c368afbd0e6892577dd6d4c035bd5170f6e8 100644 (file)
@@ -1,3 +1,15 @@
+2012-09-21  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        WebKitTestRunner needs to print frame load delegate information
+        https://bugs.webkit.org/show_bug.cgi?id=42705
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Added missing dumping from WTR::InjectedBundlePage::didFailLoadWithErrorForFrame.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::didFailLoadWithErrorForFrame):
+
 2012-09-21  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL] EventSender should mimic CTRL+o emacs shortcut
index 23c00f9ba1849d4d4f50733cc681cfcee7017bf9..689e381c353af93df8562e994c96f240a23e30ad 100644 (file)
@@ -981,6 +981,11 @@ void InjectedBundlePage::didFailLoadWithErrorForFrame(WKBundleFrameRef frame, WK
     if (!InjectedBundle::shared().isTestRunning())
         return;
 
+    if (InjectedBundle::shared().testRunner()->shouldDumpFrameLoadCallbacks()) {
+        dumpFrameDescriptionSuitableForTestResult(frame);
+        InjectedBundle::shared().stringBuilder()->appendLiteral(" - didFailLoadWithError\n");
+    }
+
     if (frame != InjectedBundle::shared().topLoadingFrame())
         return;
     InjectedBundle::shared().setTopLoadingFrame(0);