[webkit-changes] [210708] branches/safari-603-branch/LayoutTests

Thu, 12 Jan 2017 22:10:13 -0800

Title: [210708] branches/safari-603-branch/LayoutTests

Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210707 => 210708)


--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-01-13 06:10:23 UTC (rev 210707)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-01-13 06:10:26 UTC (rev 210708)
@@ -1,5 +1,22 @@
 2017-01-12  Matthew Hanson  <[email protected]>
 
+        Merge r210622. rdar://problem/28389364
+
+    2017-01-11  Joseph Pecoraro  <[email protected]>
+
+            REGRESSION(r206133): LayoutTest inspector/css/manager-preferredInspectorStyleSheetForFrame.html is a flaky failure
+            https://bugs.webkit.org/show_bug.cgi?id=162305
+            <rdar://problem/28389364>
+
+            Reviewed by Timothy Hatcher.
+
+            * inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt:
+            * inspector/css/manager-preferredInspectorStyleSheetForFrame.html:
+            Revert the change that broke this and move to more deterministic callbacks
+            that don't include the extra variance in producing output.
+
+2017-01-12  Matthew Hanson  <[email protected]>
+
         Merge r210611. rdar://problem/29471892
 
     2017-01-11  Joseph Pecoraro  <[email protected]>

Modified: branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt (210707 => 210708)


--- branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt	2017-01-13 06:10:23 UTC (rev 210707)
+++ branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt	2017-01-13 06:10:26 UTC (rev 210708)
@@ -8,12 +8,12 @@
 PASS: Should be no stylesheets.
 
 -- Running test case: CreateMainFrameInspectorStyleSheet
+PASS: Added StyleSheet origin should be 'inspector'.
+PASS: StyleSheet.isInspectorStyleSheet() should be true.
+PASS: Added StyleSheet frame should be the main frame.
 PASS: Should be one stylesheet.
 PASS: StyleSheet origin is inspector.
 PASS: StyleSheet.isInspectorStyleSheet() should be true.
-PASS: Added StyleSheet origin should be 'inspector'.
-PASS: StyleSheet.isInspectorStyleSheet() should be true.
-PASS: Added StyleSheet frame should be the main frame.
 
 -- Running test case: AnotherMainFrameRequestDoesNothing
 PASS: Should still be one stylesheet.
@@ -21,12 +21,12 @@
 PASS: StyleSheet.isInspectorStyleSheet() should be true.
 
 -- Running test case: CreateSubFrameInspectorStyleSheet
+PASS: Added StyleSheet origin should be 'inspector'.
+PASS: StyleSheet.isInspectorStyleSheet() should be true.
+PASS: Added StyleSheet frame should be a child frame.
 PASS: Should be two stylesheets.
 PASS: StyleSheet origin should be 'inspector'.
 PASS: StyleSheet.isInspectorStyleSheet() should be true.
-PASS: Added StyleSheet origin should be 'inspector'.
-PASS: StyleSheet.isInspectorStyleSheet() should be true.
-PASS: Added StyleSheet frame should be a child frame.
 
 -- Running test case: AnotherSubFrameRequestDoesNothing
 PASS: Should be two stylesheets.

Modified: branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html (210707 => 210708)


--- branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html	2017-01-13 06:10:23 UTC (rev 210707)
+++ branches/safari-603-branch/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html	2017-01-13 06:10:26 UTC (rev 210708)
@@ -24,8 +24,7 @@
         name: "CreateMainFrameInspectorStyleSheet",
         description: "First request for main frame should create inspector stylesheet.",
         test(resolve, reject) {
-            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
-            .then((event) => {
+            WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, (event) => {
                 InspectorTest.expectThat(event.data.styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "Added StyleSheet origin should be 'inspector'.");
                 InspectorTest.expectThat(event.data.styleSheet.isInspectorStyleSheet(), "StyleSheet.isInspectorStyleSheet() should be true.");
                 InspectorTest.expectThat(event.data.styleSheet.parentFrame === mainFrame, "Added StyleSheet frame should be the main frame.");
@@ -61,8 +60,7 @@
         name: "CreateSubFrameInspectorStyleSheet",
         description: "First request for subframe should create inspector stylesheet.",
         test(resolve, reject) {
-            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
-            .then((event) => {
+            WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, (event) => {
                 InspectorTest.expectThat(event.data.styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "Added StyleSheet origin should be 'inspector'.");
                 InspectorTest.expectThat(event.data.styleSheet.isInspectorStyleSheet(), "StyleSheet.isInspectorStyleSheet() should be true.");
                 InspectorTest.expectThat(event.data.styleSheet.parentFrame === childFrames[0], "Added StyleSheet frame should be a child frame.");
@@ -94,8 +92,7 @@
         }
     });
 
-    WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetRemoved)
-    .then((event) => {
+    WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetRemoved, function(event) {
         InspectorTest.assert(false, "Should not be removing any StyleSheets in this test.");
     });

Modified: branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations (210707 => 210708)


--- branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations	2017-01-13 06:10:23 UTC (rev 210707)
+++ branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations	2017-01-13 06:10:26 UTC (rev 210708)
@@ -1210,8 +1210,6 @@
 webkit.org/b/156634 inspector/formatting/formatting-_javascript_.html [ Pass Timeout ]
 webkit.org/b/158948 inspector/timeline [ Pass Timeout ]
 
-webkit.org/b/162305 inspector/css/manager-preferredInspectorStyleSheetForFrame.html [ Pass Failure ]
-
 # Colorspaces on CA OpenGL layers not available in Yosemite
 [ Yosemite ] fast/canvas/webgl/match-page-color-space.html [ Skip ]
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to