Unreviewed fix for flaky tests.
authorloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Sep 2011 15:15:49 +0000 (15:15 +0000)
committerloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Sep 2011 15:15:49 +0000 (15:15 +0000)
* inspector/timeline/timeline-dom-content-loaded-event-expected.txt:
* inspector/timeline/timeline-dom-content-loaded-event.html:
* inspector/timeline/timeline-load-event-expected.txt:
* inspector/timeline/timeline-load-event.html:
* platform/qt/Skipped:

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

LayoutTests/ChangeLog
LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt
LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html
LayoutTests/inspector/timeline/timeline-load-event-expected.txt
LayoutTests/inspector/timeline/timeline-load-event.html
LayoutTests/platform/qt/Skipped

index f2096b8f17fd3fd312fba233dd2a3910624f7ba1..f38efc718587a4cce32c14c7d017d47309e53adc 100644 (file)
@@ -1,3 +1,13 @@
+2011-09-19  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Unreviewed fix for flaky tests.
+
+        * inspector/timeline/timeline-dom-content-loaded-event-expected.txt:
+        * inspector/timeline/timeline-dom-content-loaded-event.html:
+        * inspector/timeline/timeline-load-event-expected.txt:
+        * inspector/timeline/timeline-load-event.html:
+        * platform/qt/Skipped:
+
 2011-09-19  Zsolt FehĂ©r  <feherzs@inf.u-szeged.hu>
 
         Unreviewed Qt gardening.
index 6ea7deac85461c0c793f405c8f9b9710f6554c43..7d5c0458277f33ee15d0384c8a4929a7a887892e 100644 (file)
@@ -9,4 +9,5 @@ MarkDOMContent Properties:
     usedHeapSize : <number>
     totalHeapSize : <number>
 }
+Page reloaded.
 
index 0cf317246e92411c8c31078a805f39594ea50b6f..cdb3753c0b7391ff2a799f502b2ac39e17a9a376 100644 (file)
@@ -7,13 +7,21 @@
 function test()
 {
     WebInspector.showPanel("timeline");
+    finishCalled = 0;
 
-    InspectorTest.startTimeline(function() { InspectorTest.reloadPage(); });
-    InspectorTest.waitForRecordType("MarkDOMContent", finish);
-    function finish()
+    InspectorTest.startTimeline(function() { InspectorTest.reloadPage(finish); });
+    InspectorTest.waitForRecordType("MarkDOMContent", contentEvent);
+
+    function contentEvent()
     {
         InspectorTest.printTimelineRecords("MarkDOMContent");
-        InspectorTest.completeTest();
+        InspectorTest.stopTimeline(finish);
+    }
+
+    function finish()
+    {
+        if (++finishCalled === 2)
+            InspectorTest.completeTest();
     }
 }
 
index fc79756b7dc6de6c9329492d1e5cced5c24f07e5..005cb542d369bc0c4ca06edd2ca7be2cfbfeac21 100644 (file)
@@ -9,4 +9,5 @@ MarkLoad Properties:
     usedHeapSize : <number>
     totalHeapSize : <number>
 }
+Page reloaded.
 
index 106020f22abd67cd6ccc4d25a998a9a6d135a357..f98c900626b4f285f713e36c34409b7709ca6296 100644 (file)
@@ -7,13 +7,21 @@
 function test()
 {
     WebInspector.showPanel("timeline");
+    finishCalled = 0;
 
-    InspectorTest.startTimeline(function() { InspectorTest.reloadPage(); });
-    InspectorTest.waitForRecordType("MarkLoad", finish);
-    function finish()
+    InspectorTest.startTimeline(function() { InspectorTest.reloadPage(finish); });
+    InspectorTest.waitForRecordType("MarkLoad", contentEvent);
+
+    function contentEvent()
     {
         InspectorTest.printTimelineRecords("MarkLoad");
-        InspectorTest.completeTest();
+        InspectorTest.stopTimeline(finish);
+    }
+
+    function finish()
+    {
+        if (++finishCalled === 2)
+            InspectorTest.completeTest();
     }
 }
 
index f089c5c003513b6bcd0747d7b0c968471265ce5a..26e6c4d0c7aa87e4006d3fb2352a56ba2f970a9e 100644 (file)
@@ -2434,8 +2434,3 @@ editing/pasteboard/paste-noscript.html
 # Fails on non-Chromium bots
 # https://bugs.webkit.org/show_bug.cgi?id=68278
 http/tests/history/back-with-fragment-change.php
-
-# Tests failed after r95410
-# https://bugs.webkit.org/show_bug.cgi?id=68360
-inspector/timeline/timeline-dom-content-loaded-event.html
-inspector/timeline/timeline-load-event.html