Changeset 76210 in webkit
- Timestamp:
- Jan 19, 2011 11:36:10 PM (13 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r76208 r76210 1 2011-01-19 Andrey Kosyakov <caseq@chromium.org> 2 3 Reviewed by Yury Semikhatsky. 4 5 Flaky Test: http/tests/inspector/extensions-resources-redirect.html 6 https://bugs.webkit.org/show_bug.cgi?id=52709 7 8 * http/tests/inspector/extensions-resources-redirect-expected.txt: 9 * http/tests/inspector/extensions-resources-redirect.html: 10 1 11 2011-01-19 Dominic Cooney <dominicc@google.com> 2 12 -
trunk/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt
r75950 r76210 9 9 content: undefined, encoding: undefined 10 10 RUNNING TEST: extension_testRedirectResourceFinished 11 Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?status=302 11 12 Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true 12 Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?status=30213 13 RUNNING TEST: extension_testRedirectResourcesInHAR 14 14 Resources in HAR: -
trunk/LayoutTests/http/tests/inspector/extensions-resources-redirect.html
r76118 r76210 6 6 <script type="text/javascript"> 7 7 8 function extension_doRequest( callback)8 function extension_doRequest(force, callback, nextTest) 9 9 { 10 var userCallbackCalled = false; 11 function callbackWrapper() 10 function callbackWrapper(resource) 12 11 { 13 if (!userCallbackCalled) {14 userCallbackCalled = true;12 var lastCallback = !resource || /\?redirected=true$/.test(resource.request.url); 13 if (lastCallback) 15 14 webInspector.resources.onFinished.removeListener(callbackWrapper); 16 callback(); 17 } 15 callback(resource, lastCallback); 18 16 } 19 17 webInspector.resources.onFinished.addListener(callbackWrapper); 20 webInspector.inspectedWindow.eval("doRequest( )", function(result) {18 webInspector.inspectedWindow.eval("doRequest(" + force + ")", function(result) { 21 19 if (result) 22 callbackWrapper( );20 callbackWrapper(null); 23 21 }); 24 22 } … … 26 24 function extension_testGetRedirectResourceContent(nextTest) 27 25 { 28 function onFinished( )26 function onFinished(resource, lastCallback) 29 27 { 28 if (!lastCallback) 29 return; 30 30 extension_getResourceByUrl([ /redirect-methods-result.php\?status=302$/ ], function(resource) { 31 31 resource.getContent(onContent) … … 37 37 nextTest(); 38 38 } 39 extension_doRequest( onFinished);39 extension_doRequest(false, onFinished); 40 40 } 41 41 42 42 function extension_testRedirectResourcesInHAR(nextTest) 43 43 { 44 function onFinished( )44 function onFinished(resource, lastCallback) 45 45 { 46 webInspector.resources.getHAR(onHAR); 46 if (lastCallback) 47 webInspector.resources.getHAR(onHAR); 47 48 } 48 49 function onHAR(har) … … 60 61 nextTest(); 61 62 } 62 extension_doRequest( onFinished);63 extension_doRequest(false, onFinished); 63 64 } 64 65 65 66 function extension_testRedirectResourceFinished(nextTest) 66 67 { 67 var finishedCount = 0; 68 function onFinished(resource) 68 function onFinished(resource, lastCallback) 69 69 { 70 70 output("Finished resource: " + resource.request.url); 71 if (++finishedCount === 2) { 72 webInspector.resources.onFinished.removeListener(onFinished); 71 if (lastCallback) 73 72 nextTest(); 74 }75 73 } 76 webInspector.resources.onFinished.addListener(onFinished); 77 webInspector.inspectedWindow.eval("doRequest(true)"); 74 extension_doRequest(true, onFinished); 78 75 } 79 76
Note: See TracChangeset
for help on using the changeset viewer.