Title: [241092] branches/safari-607-branch/LayoutTests
- Revision
- 241092
- Author
- alanc...@apple.com
- Date
- 2019-02-06 14:18:12 -0800 (Wed, 06 Feb 2019)
Log Message
Cherry-pick r240989. rdar://problem/47842627
Web Inspector: Fix modify-css-property-race.html test failures
https://bugs.webkit.org/show_bug.cgi?id=194282
Reviewed by Matt Baker.
Fix test failures introduced by r240946 by providing a message for expectGreaterThan assert,
so it doesn't log the actual values.
* inspector/css/modify-css-property-race-expected.txt:
* inspector/css/modify-css-property-race.html:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240989 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/LayoutTests/ChangeLog (241091 => 241092)
--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-02-06 22:18:10 UTC (rev 241091)
+++ branches/safari-607-branch/LayoutTests/ChangeLog 2019-02-06 22:18:12 UTC (rev 241092)
@@ -1,5 +1,36 @@
2019-02-06 Alan Coon <alanc...@apple.com>
+ Cherry-pick r240989. rdar://problem/47842627
+
+ Web Inspector: Fix modify-css-property-race.html test failures
+ https://bugs.webkit.org/show_bug.cgi?id=194282
+
+ Reviewed by Matt Baker.
+
+ Fix test failures introduced by r240946 by providing a message for expectGreaterThan assert,
+ so it doesn't log the actual values.
+
+ * inspector/css/modify-css-property-race-expected.txt:
+ * inspector/css/modify-css-property-race.html:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240989 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-02-05 Nikita Vasilyev <nvasil...@apple.com>
+
+ Web Inspector: Fix modify-css-property-race.html test failures
+ https://bugs.webkit.org/show_bug.cgi?id=194282
+
+ Reviewed by Matt Baker.
+
+ Fix test failures introduced by r240946 by providing a message for expectGreaterThan assert,
+ so it doesn't log the actual values.
+
+ * inspector/css/modify-css-property-race-expected.txt:
+ * inspector/css/modify-css-property-race.html:
+
+2019-02-06 Alan Coon <alanc...@apple.com>
+
Cherry-pick r240946. rdar://problem/47830598
Web Inspector: Styles: fix race conditions when editing
Modified: branches/safari-607-branch/LayoutTests/inspector/css/modify-css-property-race-expected.txt (241091 => 241092)
--- branches/safari-607-branch/LayoutTests/inspector/css/modify-css-property-race-expected.txt 2019-02-06 22:18:10 UTC (rev 241091)
+++ branches/safari-607-branch/LayoutTests/inspector/css/modify-css-property-race-expected.txt 2019-02-06 22:18:12 UTC (rev 241092)
@@ -3,9 +3,9 @@
== Running test suite: ModifyCSSProperty
-- Running test case: ModifyCSSPropertyRace.ChangeInlineStyle
-PASS: expectGreaterThan(43, 42)
-PASS: expectGreaterThan(43, 42)
-PASS: Value updated to "10px".
+PASS: Height should be greater than 42px.
+PASS: Height should be greater than 42px.
+PASS: Height should be 10px.
PASS: CSSStyleDeclaration text should update.
-PASS: expectGreaterThanOrEqual(10, 10)
+PASS: Height should be greater or equal 10px.
Modified: branches/safari-607-branch/LayoutTests/inspector/css/modify-css-property-race.html (241091 => 241092)
--- branches/safari-607-branch/LayoutTests/inspector/css/modify-css-property-race.html 2019-02-06 22:18:10 UTC (rev 241091)
+++ branches/safari-607-branch/LayoutTests/inspector/css/modify-css-property-race.html 2019-02-06 22:18:12 UTC (rev 241092)
@@ -66,17 +66,17 @@
function styleDecorationUpdated(event) {
if (!updateCount) {
let valueNumber = parseInt(getProperty("height").rawValue);
- InspectorTest.expectGreaterThan(valueNumber, 42);
+ InspectorTest.expectGreaterThan(valueNumber, 42, "Height should be greater than 42px.");
} else if (updateCount === 1) {
let valueNumber = parseInt(getProperty("height").rawValue);
- InspectorTest.expectGreaterThan(valueNumber, 42);
+ InspectorTest.expectGreaterThan(valueNumber, 42, "Height should be greater than 42px.");
getProperty("height").rawValue = "10px";
} else if (updateCount === 2) {
- InspectorTest.expectEqual(getProperty("height").rawValue, "10px", `Value updated to "10px".`);
+ InspectorTest.expectEqual(getProperty("height").rawValue, "10px", "Height should be 10px.");
InspectorTest.expectEqual(getInlineStyleDeclaration().text, "height: 10px;", "CSSStyleDeclaration text should update.");
} else {
let valueNumber = parseInt(getProperty("height").rawValue);
- InspectorTest.expectGreaterThanOrEqual(valueNumber, 10);
+ InspectorTest.expectGreaterThanOrEqual(valueNumber, 10, "Height should be greater or equal 10px.");
InspectorTest.evaluateInPage("stopExpanding()");
WI.CSSStyleDeclaration.removeEventListener(WI.CSSStyleDeclaration.Event.PropertiesChanged, styleDecorationUpdated);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
