Changeset 76210 in webkit

Timestamp:

Jan 19, 2011 11:36:10 PM (13 years ago)

Author:

caseq@chromium.org

Message:

2011-01-19 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Yury Semikhatsky.

Flaky Test: http/tests/inspector/extensions-resources-redirect.html
​https://bugs.webkit.org/show_bug.cgi?id=52709

• http/tests/inspector/extensions-resources-redirect-expected.txt:
• http/tests/inspector/extensions-resources-redirect.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/inspector/extensions-resources-redirect-expected.txt (modified) (1 diff)
• http/tests/inspector/extensions-resources-redirect.html (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-19  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Flaky Test: http/tests/inspector/extensions-resources-redirect.html
+        https://bugs.webkit.org/show_bug.cgi?id=52709
+
+        * http/tests/inspector/extensions-resources-redirect-expected.txt:
+        * http/tests/inspector/extensions-resources-redirect.html:
+
 2011-01-19  Dominic Cooney  <dominicc@google.com>
 

trunk/LayoutTests/http/tests/inspector/extensions-resources-redirect-expected.txt

@@ -9 +9 @@
 content: undefined, encoding: undefined
 RUNNING TEST: extension_testRedirectResourceFinished
+Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?status=302
 Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true
-Finished resource: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?status=302
 RUNNING TEST: extension_testRedirectResourcesInHAR
 Resources in HAR:

trunk/LayoutTests/http/tests/inspector/extensions-resources-redirect.html

@@ -6 +6 @@
 <script type="text/javascript">
 
-function extension_doRequest(callback)
+function extension_doRequest(force, callback, nextTest)
 {
-    var userCallbackCalled = false;
-    function callbackWrapper()
+    function callbackWrapper(resource)
     {
-        if (!userCallbackCalled) {
-            userCallbackCalled = true;
+        var lastCallback = !resource || /\?redirected=true$/.test(resource.request.url);
+        if (lastCallback)
             webInspector.resources.onFinished.removeListener(callbackWrapper);
-            callback();
-        }
+        callback(resource, lastCallback);
     }
     webInspector.resources.onFinished.addListener(callbackWrapper);
-    webInspector.inspectedWindow.eval("doRequest()", function(result) {
+    webInspector.inspectedWindow.eval("doRequest(" + force + ")", function(result) {
         if (result)
-            callbackWrapper();
+            callbackWrapper(null);
     });
 }
@@ -26 +24 @@
 function extension_testGetRedirectResourceContent(nextTest)
 {
-    function onFinished()
+    function onFinished(resource, lastCallback)
     {
+        if (!lastCallback)
+            return;
         extension_getResourceByUrl([ /redirect-methods-result.php\?status=302$/ ], function(resource) {
             resource.getContent(onContent)
@@ -37 +37 @@
         nextTest();
     }
-    extension_doRequest(onFinished);
+    extension_doRequest(false, onFinished);
 }
 
 function extension_testRedirectResourcesInHAR(nextTest)
 {
-    function onFinished()
+    function onFinished(resource, lastCallback)
     {
-        webInspector.resources.getHAR(onHAR);
+        if (lastCallback)
+            webInspector.resources.getHAR(onHAR);
     }
     function onHAR(har)
@@ -60 +61 @@
         nextTest();
     }
-    extension_doRequest(onFinished);
+    extension_doRequest(false, onFinished);
 }
 
 function extension_testRedirectResourceFinished(nextTest)
 {
-    var finishedCount = 0;
-    function onFinished(resource)
+    function onFinished(resource, lastCallback)
     {
         output("Finished resource: " + resource.request.url);
-        if (++finishedCount === 2) {
-            webInspector.resources.onFinished.removeListener(onFinished);
+        if (lastCallback)
             nextTest();
-        }
     }
-    webInspector.resources.onFinished.addListener(onFinished);
-    webInspector.inspectedWindow.eval("doRequest(true)");
+    extension_doRequest(true, onFinished);
 }