Bug 116125 – pathSuitableForTestResult returns duplicate path

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Alex Christensen]

When running LayoutTests/webarchive/loading/test-loading-archive-subresource-null-mimetype.html, WTR::pathSuitableForTestResult is given the string "file:///test.png" and returns "test.png/test.png" because WKURLCopyPath returns "/test.png" which sets indexBaseName to 0, which is not handled correctly.  This patch fixes this minor bug which is only encountered in this test case, which should be unskipped.

[Alex Christensen]

Created attachment 201763 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 201763 [details]
Patch

Rejecting attachment 201763 [details] from commit-queue.

New failing tests:
webarchive/loading/test-loading-archive-subresource-null-mimetype.html
Full output: http://webkit-queues.appspot.com/results/468672

[WebKit Commit Bot]

Created attachment 201777 [details]
Archive of layout-test-results from webkit-cq-03 for mac-mountainlion

The attached test failures were seen while running run-webkit-tests on the commit-queue.
Bot: webkit-cq-03  Port: mac-mountainlion  Platform: Mac OS X 10.8.3

[Build Bot]

Comment on attachment 201763 [details]
Patch

Attachment 201763 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/480010

New failing tests:
webarchive/loading/test-loading-archive-subresource-null-mimetype.html

[Build Bot]

Created attachment 201818 [details]
Archive of layout-test-results from webkit-ews-04 for mac-mountainlion

The attached test failures were seen while running run-webkit-tests on the mac-ews.
Bot: webkit-ews-04  Port: mac-mountainlion  Platform: Mac OS X 10.8.2

[Alex Christensen]

One of these failures is my fault.  I should have made pathSuitableForTestResult behave the same as DumpRenderTree's _drt_descriptionSuitableForTestResult

[Alex Christensen]

Created attachment 202300 [details]
Patch

[Alex Christensen]

Created attachment 202301 [details]
Patch

[Tim Horton]

Comment on attachment 202301 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=202301&action=review

> Tools/ChangeLog:22
> +        Pass the main frame's URL to pathSuitableForTestResult.
> +        (WTR::dumpResponseDescriptionSuitableForTestResult):
> +        Pass the main frame's URL to pathSuitableForTestResult.
> +        (WTR::InjectedBundlePage::willPerformClientRedirectForFrame):
> +        Pass the main frame's URL to pathSuitableForTestResult.
> +        (WTR::InjectedBundlePage::didInitiateLoadForResource):
> +        Pass the main frame's URL to pathSuitableForTestResult.
> +        (WTR::InjectedBundlePage::willSendRequestForFrame):
> +        Pass the main frame's URL to pathSuitableForTestResult.
> +        (WTR::InjectedBundlePage::didReceiveResponseForResource):
> +        Pass the main frame's URL to pathSuitableForTestResult.

You could have this once at the bottom of the set of things-that-have-the-same-comment.

> Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:605
> +    static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->willPerformClientRedirectForFrame(frame, url, delay, date, WKBundleFrameCopyURL(WKBundlePageGetMainFrame(page)));

Who owns the string copy you're making here? Who will free it?

[Alex Christensen]

Created attachment 202309 [details]
Patch

[Alex Christensen]

Created attachment 202315 [details]
Patch

[Tim Horton]

Comment on attachment 202315 [details]
Patch

Looks reasonable to me, assuming the tests pass.

[WebKit Commit Bot]

Comment on attachment 202315 [details]
Patch

Clearing flags on attachment: 202315

Committed r150386: <http://trac.webkit.org/changeset/150386>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[WebKit Commit Bot]

Re-opened since this is blocked by bug 116572

[Alexey Proskuryakov]

Committed with minor tweaks in <http://trac.webkit.org/changeset/153830>.