Title: [100439] trunk/LayoutTests
- Revision
- 100439
- Author
- [email protected]
- Date
- 2011-11-16 06:08:28 -0800 (Wed, 16 Nov 2011)
Log Message
Layout Test inspector/extensions/extensions-events.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=72447
Reviewed by Yury Semikhatsky.
* inspector/extensions/extensions-events-expected.txt:
* inspector/extensions/extensions-events.html:
* platform/chromium/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (100438 => 100439)
--- trunk/LayoutTests/ChangeLog 2011-11-16 14:04:57 UTC (rev 100438)
+++ trunk/LayoutTests/ChangeLog 2011-11-16 14:08:28 UTC (rev 100439)
@@ -1,3 +1,14 @@
+2011-11-16 Andrey Kosyakov <[email protected]>
+
+ Layout Test inspector/extensions/extensions-events.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=72447
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/extensions/extensions-events-expected.txt:
+ * inspector/extensions/extensions-events.html:
+ * platform/chromium/test_expectations.txt:
+
2011-11-16 Csaba Osztrogonác <[email protected]>
[Qt] Unreviewed gardening after r100281.
Modified: trunk/LayoutTests/inspector/extensions/extensions-events-expected.txt (100438 => 100439)
--- trunk/LayoutTests/inspector/extensions/extensions-events-expected.txt 2011-11-16 14:04:57 UTC (rev 100438)
+++ trunk/LayoutTests/inspector/extensions/extensions-events-expected.txt 2011-11-16 14:08:28 UTC (rev 100439)
@@ -14,6 +14,8 @@
RUNNING TEST: extension_testTimelineEvents
Got Layout event from timeline
RUNNING TEST: extension_testViewShowHide
+Got onShown event for sidebar
+Sidebar shown, location: .../extension-sidebar.html
Got onHidden event for sidebar
Got onShown event for panel
Panel shown, location: .../extension-panel.html
Modified: trunk/LayoutTests/inspector/extensions/extensions-events.html (100438 => 100439)
--- trunk/LayoutTests/inspector/extensions/extensions-events.html 2011-11-16 14:04:57 UTC (rev 100438)
+++ trunk/LayoutTests/inspector/extensions/extensions-events.html 2011-11-16 14:08:28 UTC (rev 100439)
@@ -67,6 +67,7 @@
{
var listenersToCleanup = [];
var sidebar;
+ var beenToExtensionPanel = false;
function onViewEvent(type, viewName, viewWindow)
{
@@ -75,12 +76,16 @@
return;
if (viewName === "panel") {
output("Panel shown, location: " + trimURL(viewWindow.location.href));
- addListener(sidebar, "sidebar", "onShown");
extension_showPanel("elements");
} else if (viewName === "sidebar") {
output("Sidebar shown, location: " + trimURL(viewWindow.location.href));
- cleanupListeners();
- nextTest();
+ if (!beenToExtensionPanel) {
+ extension_showPanel("extension");
+ beenToExtensionPanel = true;
+ } else {
+ cleanupListeners();
+ nextTest();
+ }
}
}
function addListener(view, viewName, type)
@@ -100,8 +105,8 @@
addListener(panel, "panel", "onShown");
addListener(panel, "panel", "onHidden");
addListener(sidebar, "sidebar", "onHidden");
+ addListener(sidebar, "sidebar", "onShown");
sidebar.setPage(basePath + "extension-sidebar.html");
- extension_showPanel("extension");
}
extension_showPanel("elements");
var basePath = location.pathname.replace(/\/[^/]*$/, "/");
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (100438 => 100439)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-16 14:04:57 UTC (rev 100438)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-16 14:08:28 UTC (rev 100439)
@@ -3911,8 +3911,6 @@
BUGWK72434 : inspector/styles/svg-style.xhtml = TEXT PASS
-BUGWK72447 : inspector/extensions/extensions-events.html = TEXT PASS TIMEOUT
-
BUGWK72485 DEBUG : animations/animation-direction-normal.html = TEXT PASS
BUGWK72487 MAC : compositing/layers-inside-overflow-scroll.html = IMAGE
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
