Title: [255309] branches/safari-610.1.1-branch/LayoutTests
- Revision
- 255309
- Author
- [email protected]
- Date
- 2020-01-28 13:50:11 -0800 (Tue, 28 Jan 2020)
Log Message
Cherry-pick r254834. rdar://problem/58612520
REGRESSION (r250655?): [ Mac Debug ] inspector/runtime/promise-native-getter.html is a flaky timeout
https://bugs.webkit.org/show_bug.cgi?id=206303
<rdar://problem/58612520>
Reviewed by Darin Adler.
Rework the test to not be reliant on real world timing.
* inspector/runtime/promise-native-getter.html:
* inspector/runtime/promise-native-getter-expected.txt:
* platform/mac/TestExpectations:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254834 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.1-branch/LayoutTests/ChangeLog (255308 => 255309)
--- branches/safari-610.1.1-branch/LayoutTests/ChangeLog 2020-01-28 21:50:09 UTC (rev 255308)
+++ branches/safari-610.1.1-branch/LayoutTests/ChangeLog 2020-01-28 21:50:11 UTC (rev 255309)
@@ -1,5 +1,37 @@
2020-01-28 Russell Epstein <[email protected]>
+ Cherry-pick r254834. rdar://problem/58612520
+
+ REGRESSION (r250655?): [ Mac Debug ] inspector/runtime/promise-native-getter.html is a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=206303
+ <rdar://problem/58612520>
+
+ Reviewed by Darin Adler.
+
+ Rework the test to not be reliant on real world timing.
+
+ * inspector/runtime/promise-native-getter.html:
+ * inspector/runtime/promise-native-getter-expected.txt:
+ * platform/mac/TestExpectations:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254834 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-20 Devin Rousso <[email protected]>
+
+ REGRESSION (r250655?): [ Mac Debug ] inspector/runtime/promise-native-getter.html is a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=206303
+ <rdar://problem/58612520>
+
+ Reviewed by Darin Adler.
+
+ Rework the test to not be reliant on real world timing.
+
+ * inspector/runtime/promise-native-getter.html:
+ * inspector/runtime/promise-native-getter-expected.txt:
+ * platform/mac/TestExpectations:
+
+2020-01-28 Russell Epstein <[email protected]>
+
Cherry-pick r254697. rdar://problem/58649476
REGRESSION: [ Mac Debug WK1 ] inspector/page/overrideSetting-ICECandidateFilteringEnabled.html is a flaky failure
Modified: branches/safari-610.1.1-branch/LayoutTests/inspector/runtime/promise-native-getter-expected.txt (255308 => 255309)
--- branches/safari-610.1.1-branch/LayoutTests/inspector/runtime/promise-native-getter-expected.txt 2020-01-28 21:50:09 UTC (rev 255308)
+++ branches/safari-610.1.1-branch/LayoutTests/inspector/runtime/promise-native-getter-expected.txt 2020-01-28 21:50:11 UTC (rev 255309)
@@ -1,5 +1,6 @@
+CONSOLE MESSAGE: line 25: [object Promise]
CONSOLE MESSAGE: line 8: unhandledrejection - "test"
CONSOLE MESSAGE: Unhandled Promise Rejection: test
-CONSOLE MESSAGE: line 20: caught - "test"
-CONSOLE MESSAGE: line 12: rejectionhandled - "test"
+CONSOLE MESSAGE: line 14: caught - "test"
+CONSOLE MESSAGE: line 20: rejectionhandled - "test"
Tests that the injected script only `.then()`s promises if they are returned by native getters.
Modified: branches/safari-610.1.1-branch/LayoutTests/inspector/runtime/promise-native-getter.html (255308 => 255309)
--- branches/safari-610.1.1-branch/LayoutTests/inspector/runtime/promise-native-getter.html 2020-01-28 21:50:09 UTC (rev 255308)
+++ branches/safari-610.1.1-branch/LayoutTests/inspector/runtime/promise-native-getter.html 2020-01-28 21:50:11 UTC (rev 255309)
@@ -6,6 +6,14 @@
function createUnhandledPromise() {
window.addEventListener("unhandledrejection", (event) => {
console.log("unhandledrejection - " + JSON.stringify(event.reason));
+
+ console.assert(event.promise === rejectedPromiseTest, "unhandledrejection promise should be rejectedPromiseTest.");
+
+ setTimeout(() => {
+ window.rejectedPromiseTest.catch((value) => {
+ console.log("caught - " + JSON.stringify(value));
+ });
+ });
});
window.addEventListener("rejectionhandled", (event) => {
@@ -13,13 +21,8 @@
TestPage.dispatchEventToFrontend("rejectionhandled");
});
- let promise = Promise.reject("test");
-
- setTimeout(() => {
- promise.catch((value) => {
- console.log("caught - " + JSON.stringify(value));
- });
- }, 5);
+ window.rejectedPromiseTest = Promise.reject("test");
+ console.log(window.rejectedPromiseTest); // Ensure that the injected script sees the `Promise`.
}
function test()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
