Modified: trunk/LayoutTests/ChangeLog (100123 => 100124)
--- trunk/LayoutTests/ChangeLog 2011-11-14 11:49:47 UTC (rev 100123)
+++ trunk/LayoutTests/ChangeLog 2011-11-14 11:52:50 UTC (rev 100124)
@@ -1,3 +1,22 @@
+2011-11-14 Vsevolod Vlasov <[email protected]>
+
+ http/tests/inspector/resource-tree/appcache-iframe-manifests.html failing on some chromium bots after r99988
+ https://bugs.webkit.org/show_bug.cgi?id=72177
+
+ Reviewed by Tony Gentilcore.
+
+ Added waitForFrameManifestURLAndStatus() call for the second frame
+ with manifestId=1, fixed sort functions in appcache-test.js
+
+ * http/tests/inspector/resource-tree/appcache-iframe-manifests.html:
+ * http/tests/inspector/resource-tree/appcache-test.js:
+ (initialize_ApplicationCacheTest.InspectorTest.dumpApplicationCacheModel.compareFunc):
+ (initialize_ApplicationCacheTest.InspectorTest.dumpApplicationCacheModel):
+ (initialize_ApplicationCacheTest.InspectorTest.dumpApplicationCacheStatusesRecords.compareFunc):
+ (initialize_ApplicationCacheTest.InspectorTest.dumpApplicationCacheStatusesRecords):
+ (initialize_ApplicationCacheTest):
+ * platform/chromium/test_expectations.txt:
+
2011-11-14 Tony Gentilcore <[email protected]>
ASSERTION FAILED: fontCache()->generation() == m_generation (running new-run-webkit-tests)
Modified: trunk/LayoutTests/http/tests/inspector/resource-tree/appcache-iframe-manifests.html (100123 => 100124)
--- trunk/LayoutTests/http/tests/inspector/resource-tree/appcache-iframe-manifests.html 2011-11-14 11:49:47 UTC (rev 100123)
+++ trunk/LayoutTests/http/tests/inspector/resource-tree/appcache-iframe-manifests.html 2011-11-14 11:52:50 UTC (rev 100124)
@@ -27,7 +27,7 @@
InspectorTest.navigateIFrame(frameId1, "resources/page-with-manifest.php?manifestId=2", step3);
}
- function step3(frameId)
+ function step3()
{
InspectorTest.waitForFrameManifestURLAndStatus(frameId1, "manifest.php?manifestId=2", applicationCache.IDLE, step4);
}
@@ -60,41 +60,46 @@
function step8()
{
+ InspectorTest.waitForFrameManifestURLAndStatus(frameId2, "manifest.php?manifestId=1", applicationCache.IDLE, step9);
+ }
+
+ function step9()
+ {
InspectorTest.dumpApplicationCache();
InspectorTest.dumpApplicationCacheStatusesRecords();
- InspectorTest.removeIFrame(frameId3, step9);
+ InspectorTest.removeIFrame(frameId3, step10);
}
- function step9(frameId)
+ function step10()
{
- InspectorTest.waitForFrameManifestURLAndStatus(frameId3, "", applicationCache.UNCACHED, step10);
+ InspectorTest.waitForFrameManifestURLAndStatus(frameId3, "", applicationCache.UNCACHED, step11);
}
- function step10()
+ function step11()
{
InspectorTest.dumpApplicationCache();
InspectorTest.dumpApplicationCacheStatusesRecords();
- InspectorTest.removeIFrame(frameId2, step11);
+ InspectorTest.removeIFrame(frameId2, step12);
}
- function step11(frameId)
+ function step12()
{
- InspectorTest.waitForFrameManifestURLAndStatus(frameId2, "", applicationCache.UNCACHED, step12);
+ InspectorTest.waitForFrameManifestURLAndStatus(frameId2, "", applicationCache.UNCACHED, step13);
}
- function step12()
+ function step13()
{
InspectorTest.dumpApplicationCache();
InspectorTest.dumpApplicationCacheStatusesRecords();
- InspectorTest.removeIFrame(frameId1, step13);
+ InspectorTest.removeIFrame(frameId1, step14);
}
- function step13(frameId)
+ function step14()
{
- InspectorTest.waitForFrameManifestURLAndStatus(frameId1, "", applicationCache.UNCACHED, step14);
+ InspectorTest.waitForFrameManifestURLAndStatus(frameId1, "", applicationCache.UNCACHED, step15);
}
- function step14()
+ function step15()
{
InspectorTest.dumpApplicationCache();
InspectorTest.dumpApplicationCacheStatusesRecords();
Modified: trunk/LayoutTests/http/tests/inspector/resource-tree/appcache-test.js (100123 => 100124)
--- trunk/LayoutTests/http/tests/inspector/resource-tree/appcache-test.js 2011-11-14 11:49:47 UTC (rev 100123)
+++ trunk/LayoutTests/http/tests/inspector/resource-tree/appcache-test.js 2011-11-14 11:52:50 UTC (rev 100124)
@@ -122,7 +122,7 @@
}
function compareFunc(a, b) {
- return InspectorTest.frameIdToString(frameId).localeCompare(InspectorTest.frameIdToString(frameId));
+ return InspectorTest.frameIdToString(a).localeCompare(InspectorTest.frameIdToString(b));
}
frameIds.sort(compareFunc);
@@ -198,7 +198,7 @@
}
function compareFunc(a, b) {
- return InspectorTest.frameIdToString(frameId).localeCompare(InspectorTest.frameIdToString(frameId));
+ return InspectorTest.frameIdToString(a).localeCompare(InspectorTest.frameIdToString(b));
}
frameIds.sort(compareFunc);
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (100123 => 100124)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-14 11:49:47 UTC (rev 100123)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-14 11:52:50 UTC (rev 100124)
@@ -3870,8 +3870,6 @@
BUGWK70395 MAC : fast/dom/rtl-scroll-to-leftmost-and-resize.html = IMAGE+TEXT
-BUGWK72177 : http/tests/inspector/resource-tree/appcache-iframe-manifests.html = TEXT
-
BUGWK72189 WIN : accessibility/adjacent-continuations-cause-assertion-failure.html = TEXT
BUGWK72204 : inspector/debugger/script-formatter.html = TEXT
