Title: [173760] trunk
Revision
173760
Author
[email protected]
Date
2014-09-19 10:38:13 -0700 (Fri, 19 Sep 2014)

Log Message

WTR and DRT didReceiveAuthenticationChallengeInFrame should print messages consistently
https://bugs.webkit.org/show_bug.cgi?id=136847

Tools:

Added protection space host and port logging to WTR didReceiveAuthenticationChallengeInFrame.

Patch by Youenn Fablet <[email protected]> on 2014-09-19
Reviewed by Alexey Proskuryakov.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::didReceiveAuthenticationChallengeInFrame):

LayoutTests:

Updated WK2 expected.txt files according new logging of didReceiveAuthenticationChallengeInFrame.
Factorized efl/gtk platform specific expected files as WK2 expected files.

Patch by Youenn Fablet <[email protected]> on 2014-09-19
Reviewed by Alexey Proskuryakov.

* platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt: Removed.
* platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt: Removed.
* platform/gtk/http/tests/media/video-auth-expected.txt: Removed.
* platform/gtk/http/tests/misc/401-alternative-content-expected.txt: Removed.
* platform/gtk/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt: Removed.
* platform/gtk/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt: Removed.
* platform/gtk/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt: Removed.
* platform/gtk/http/tests/security/401-logout/401-logout-expected.txt: Removed.
* platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt: Removed.
* platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt: Removed.
* platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt:
* platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt:
* platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt:
* platform/wk2/http/tests/media/video-auth-expected.txt: Renamed from LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt.
* platform/wk2/http/tests/misc/401-alternative-content-expected.txt:
* platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt:
* platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt:
* platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt:
* platform/wk2/http/tests/security/401-logout/401-logout-expected.txt:
* platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt:
* platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (173759 => 173760)


--- trunk/LayoutTests/ChangeLog	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/ChangeLog	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,3 +1,35 @@
+2014-09-19  Youenn Fablet  <[email protected]>
+
+        WTR and DRT didReceiveAuthenticationChallengeInFrame should print messages consistently
+        https://bugs.webkit.org/show_bug.cgi?id=136847
+
+        Updated WK2 expected.txt files according new logging of didReceiveAuthenticationChallengeInFrame.
+        Factorized efl/gtk platform specific expected files as WK2 expected files. 
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt: Removed.
+        * platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt: Removed.
+        * platform/gtk/http/tests/media/video-auth-expected.txt: Removed.
+        * platform/gtk/http/tests/misc/401-alternative-content-expected.txt: Removed.
+        * platform/gtk/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt: Removed.
+        * platform/gtk/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt: Removed.
+        * platform/gtk/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt: Removed.
+        * platform/gtk/http/tests/security/401-logout/401-logout-expected.txt: Removed.
+        * platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt: Removed.
+        * platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt: Removed.
+        * platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt:
+        * platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt:
+        * platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt:
+        * platform/wk2/http/tests/media/video-auth-expected.txt: Renamed from LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt.
+        * platform/wk2/http/tests/misc/401-alternative-content-expected.txt:
+        * platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt:
+        * platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt:
+        * platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt:
+        * platform/wk2/http/tests/security/401-logout/401-logout-expected.txt:
+        * platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt:
+        * platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt:
+
 2014-09-18  Daniel Bates  <[email protected]>
 
         REGRESSION (r168921): SVG elements may be unnecessarily rebuilt

Deleted: trunk/LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/efl/http/tests/media/video-auth-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,6 +0,0 @@
-didReceiveAuthenticationChallenge - Responding with username:password
- 
-Tests that the media player sends authorization credentials when requesting a media file.  
-EVENT(canplay)
-END OF TEST
-

Deleted: trunk/LayoutTests/platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,29 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test makes sure that once WebCore preemptively sends out Basic credentials it thinks apply to a new resource, and that resource response with a 401 challenge, that it doesn't try to send the same wrong credentials a second time.
-  
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Authenticated as user: wrongusername password: wrongpassword
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-Authenticated as user: correctusername password: correctpassword

Deleted: trunk/LayoutTests/platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/loading/basic-credentials-sent-automatically-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,57 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with first:first-pw
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-<unknown> - didReceiveAuthenticationChallenge - Responding with second:second-pw
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test makes sure that once an HTTP Basic Auth. protected path is authenticated once, urls that emanate from that path automatically have their credentials sent without a challenge.
-The first frame's path is /loading/resources/subresources/protected-resource.php, and we should get a challenge for it.
-It will be authorized with first/first-pw.
-The second frame's path is /loading/resources/protected-resource.php, and we should get a challenge for it, because it does not share a common subpath of the previously authorized resource.
-It will be authorized with second/second-pw.
-The third frame's path is also /loading/resources/protected-resource.php, and we should *not* get a challenge for it because we authorized to this path for the second frame.
-It will be authorized with second/second-pw.
-The fourth frame's path is /loading/resources/othersubresources/protected-resource.php, and we should *not* get a challenge for it, because it has a common subpath with the previously authorized second and third frames.
-It will be authorized with second/second-pw.
-  
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Authenticated as user: first password: first-pw
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-Authenticated as user: second password: second-pw
-
---------
-Frame: '<!--framePath //<!--frame2-->-->'
---------
-Authenticated as user: second password: second-pw
-
---------
-Frame: '<!--framePath //<!--frame3-->-->'
---------
-Authenticated as user: second password: second-pw

Deleted: trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,6 +0,0 @@
-didReceiveAuthenticationChallenge - Responding with username:password
- 
-Tests that the media player sends authorization credentials when requesting a media file.  
-EVENT(canplay)
-END OF TEST
-

Deleted: trunk/LayoutTests/platform/gtk/http/tests/misc/401-alternative-content-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/gtk/http/tests/misc/401-alternative-content-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/misc/401-alternative-content-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,2 +0,0 @@
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-PASS

Deleted: trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/failed-auth-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,8 +0,0 @@
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-Test for bug 13075: XMLHttpRequest with failed authentication should set status to 401.
-
-Sync, no credentials: OK
-Sync, incorrect credentials: OK
-Async, no credentials: OK
-Async, incorrect credentials: OK

Deleted: trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/gtk/http/tests/xmlhttprequest/remember-bad-password-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,13 +0,0 @@
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-rdar://problem/7062824 A wrong password entered for site or proxy auth remains in WebCore credential storage, and is sent with subsequent requests.
-
-This test counts the number of failed requests server side.
-
-PASS
-
-Sync
-With credentials Without credentials
-Async
-With credentials Without credentials 
-Status

Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -3,7 +3,7 @@
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
-didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame

Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -2,14 +2,14 @@
 main frame - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
-didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
 main frame - didHandleOnloadEventsForFrame
 frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
 frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword
 frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
 frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame

Modified: trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -2,14 +2,14 @@
 main frame - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
-didReceiveAuthenticationChallenge - Responding with first:first-pw
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with first:first-pw
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
 main frame - didHandleOnloadEventsForFrame
 frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
 frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-didReceiveAuthenticationChallenge - Responding with second:second-pw
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with second:second-pw
 frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
 frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
 frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame

Copied: trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt (from rev 173755, trunk/LayoutTests/platform/gtk/http/tests/media/video-auth-expected.txt) (0 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/wk2/http/tests/media/video-auth-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -0,0 +1,6 @@
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with username:password
+ 
+Tests that the media player sends authorization credentials when requesting a media file.  
+EVENT(canplay)
+END OF TEST
+

Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/401-alternative-content-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,2 +1,2 @@
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 PASS

Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,4 +1,4 @@
-didReceiveAuthenticationChallenge - Responding with testUser:testPassword
+localhost:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
 https://bugs.webkit.org/show_bug.cgi?id=40138
 You should load this page at 127.0.0.1:8000 so localhost:8000 is considered a different security origin.
 This test loads a php script which demands http authentication, then uses it to redirect to another script in a different origin that shows what authentication headers were sent with the final request.

Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,4 +1,4 @@
-didReceiveAuthenticationChallenge - Responding with testUser:testPassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
 https://bugs.webkit.org/show_bug.cgi?id=66354
 You should load this page at 127.0.0.1:8000 because the test relies on redirects within the 127.0.0.1:8000 security origin.
 This test loads a php script which demands http authentication, then uses it to redirect to another script in the same origin that shows what authentication headers were sent with the final request.

Modified: trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,4 +1,4 @@
-didReceiveAuthenticationChallenge - Responding with testUser:testPassword
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with testUser:testPassword
 https://bugs.webkit.org/show_bug.cgi?id=105190
 You should load this page at 127.0.0.1:8000 because the test relies on redirects within the 127.0.0.1:8000 security origin.
 This test loads a php script which demands http authentication, then uses it to redirect via 301 to another script in the same origin that shows what authentication headers were sent with the final request. It verifies that the credentials are not placed in the final URL.

Modified: trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/security/401-logout/401-logout-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,3 +1,3 @@
-didReceiveAuthenticationChallenge - Responding with username:password
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with username:password
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 PASS

Modified: trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/failed-auth-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,5 +1,5 @@
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 Test for bug 13075: XMLHttpRequest with failed authentication should set status to 401.
 
 Sync, no credentials: OK

Modified: trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt (173759 => 173760)


--- trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/LayoutTests/platform/wk2/http/tests/xmlhttprequest/remember-bad-password-expected.txt	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,5 +1,5 @@
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
-didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+127.0.0.1:8000 - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 rdar://problem/7062824 A wrong password entered for site or proxy auth remains in WebCore credential storage, and is sent with subsequent requests.
 
 This test counts the number of failed requests server side.

Modified: trunk/Tools/ChangeLog (173759 => 173760)


--- trunk/Tools/ChangeLog	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/Tools/ChangeLog	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1,3 +1,15 @@
+2014-09-19  Youenn Fablet  <[email protected]>
+
+        WTR and DRT didReceiveAuthenticationChallengeInFrame should print messages consistently
+        https://bugs.webkit.org/show_bug.cgi?id=136847
+
+        Added protection space host and port logging to WTR didReceiveAuthenticationChallengeInFrame.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::didReceiveAuthenticationChallengeInFrame):
+
 2014-09-19  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Missing inspector files in the tarball

Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (173759 => 173760)


--- trunk/Tools/WebKitTestRunner/TestController.cpp	2014-09-19 16:36:27 UTC (rev 173759)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2014-09-19 17:38:13 UTC (rev 173760)
@@ -1276,11 +1276,13 @@
         return;
     }
 
-    String message;
+    std::string host = toSTD(adoptWK(WKProtectionSpaceCopyHost(protectionSpace)).get());
+    int port = WKProtectionSpaceGetPort(protectionSpace);
+    String message = String::format("%s:%d - didReceiveAuthenticationChallenge - ", host.c_str(), port);
     if (!m_handlesAuthenticationChallenges)
-        message = "didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet\n";
+        message.append("Simulating cancelled authentication sheet\n");
     else
-        message = String::format("didReceiveAuthenticationChallenge - Responding with %s:%s\n", m_authenticationUsername.utf8().data(), m_authenticationPassword.utf8().data());
+        message.append(String::format("Responding with %s:%s\n", m_authenticationUsername.utf8().data(), m_authenticationPassword.utf8().data()));
     m_currentInvocation->outputText(message);
 
     if (!m_handlesAuthenticationChallenges) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to