From 610d7d48bedab05ab06cf98f9592697b8ff1b456 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 13 Nov 2019 16:57:10 -0500 Subject: [PATCH 1/4] Expect new PreconditionFailedError interface during WPT tests. --- tests/wpt/mozilla/meta/mozilla/interfaces.html.ini | 4 ---- tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini | 4 ---- tests/wpt/mozilla/tests/mozilla/interfaces.js | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/interfaces.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini diff --git a/tests/wpt/mozilla/meta/mozilla/interfaces.html.ini b/tests/wpt/mozilla/meta/mozilla/interfaces.html.ini deleted file mode 100644 index 378eade335e..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/interfaces.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[interfaces.html] - [Interfaces exposed on the window] - expected: FAIL - diff --git a/tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini b/tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini deleted file mode 100644 index 701d363381a..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/interfaces.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[interfaces.worker.html] - [interfaces] - expected: FAIL - diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.js b/tests/wpt/mozilla/tests/mozilla/interfaces.js index 786f6e12515..c46c336f8a8 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.js +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.js @@ -55,7 +55,7 @@ function test_interfaces(interfaceNamesInGlobalScope) { var sources = [ ecmaGlobals, interfaceNamesInGlobalScope, - ["AssertionError", "EventWatcher"], + ["AssertionError", "EventWatcher", "PreconditionFailedError"], ]; var interfaceMap = {}; From ebf54c978867cbf1e657aa97810eac4ba40bea2f Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 13 Nov 2019 16:58:55 -0500 Subject: [PATCH 2/4] Convert deprecated single-page tests to use proper test harness. --- .../inline-event-listener-panic.html.ini | 2 -- .../window_requestAnimationFrame2.html.ini | 6 ----- .../mozilla/inline-event-listener-panic.html | 11 +++++---- .../window_requestAnimationFrame2.html | 23 ++++++++++--------- 4 files changed, 18 insertions(+), 24 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/inline-event-listener-panic.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/window_requestAnimationFrame2.html.ini diff --git a/tests/wpt/mozilla/meta/mozilla/inline-event-listener-panic.html.ini b/tests/wpt/mozilla/meta/mozilla/inline-event-listener-panic.html.ini deleted file mode 100644 index d2d530029d9..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/inline-event-listener-panic.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[inline-event-listener-panic.html] - expected: ERROR diff --git a/tests/wpt/mozilla/meta/mozilla/window_requestAnimationFrame2.html.ini b/tests/wpt/mozilla/meta/mozilla/window_requestAnimationFrame2.html.ini deleted file mode 100644 index be85f58c9b4..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/window_requestAnimationFrame2.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[window_requestAnimationFrame2.html] - type: testharness - expected: ERROR - [Test throwing an error inside requestAnimationFrame callback] - expected: FAIL - diff --git a/tests/wpt/mozilla/tests/mozilla/inline-event-listener-panic.html b/tests/wpt/mozilla/tests/mozilla/inline-event-listener-panic.html index 2418893bc05..acde98607ae 100644 --- a/tests/wpt/mozilla/tests/mozilla/inline-event-listener-panic.html +++ b/tests/wpt/mozilla/tests/mozilla/inline-event-listener-panic.html @@ -5,10 +5,11 @@ diff --git a/tests/wpt/mozilla/tests/mozilla/window_requestAnimationFrame2.html b/tests/wpt/mozilla/tests/mozilla/window_requestAnimationFrame2.html index 237ef108c5c..3227b28d5b2 100644 --- a/tests/wpt/mozilla/tests/mozilla/window_requestAnimationFrame2.html +++ b/tests/wpt/mozilla/tests/mozilla/window_requestAnimationFrame2.html @@ -6,18 +6,19 @@ From a1df2a75d0a2d3cd8f6ee25f11b32d556e81ad54 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 13 Nov 2019 17:03:18 -0500 Subject: [PATCH 3/4] Fix test syntax error. --- .../mozilla/meta/mozilla/animation-removed-node.html.ini | 6 ------ tests/wpt/mozilla/tests/mozilla/animation-removed-node.html | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/animation-removed-node.html.ini diff --git a/tests/wpt/mozilla/meta/mozilla/animation-removed-node.html.ini b/tests/wpt/mozilla/meta/mozilla/animation-removed-node.html.ini deleted file mode 100644 index ec6cab9857c..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/animation-removed-node.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[animation-removed-node.html] - prefs: [css.animations.testing.enabled:true] - expected: ERROR - [animation-removed-node] - expected: FAIL - diff --git a/tests/wpt/mozilla/tests/mozilla/animation-removed-node.html b/tests/wpt/mozilla/tests/mozilla/animation-removed-node.html index a2f9dfe284a..d8845c87318 100644 --- a/tests/wpt/mozilla/tests/mozilla/animation-removed-node.html +++ b/tests/wpt/mozilla/tests/mozilla/animation-removed-node.html @@ -23,7 +23,7 @@ div.test { animation: boo 1s infinite; } // Verify that the previous animations are no longer considered active. assert_equals(window.runningAnimationCount, 0); t.done(); - }); + })); })); }); }, "Animations are no longer active when a node can't be animated."); From 4041cafab098ee35afbeb9b8eeef8ee528d27424 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 13 Nov 2019 17:10:43 -0500 Subject: [PATCH 4/4] Update test manifest. --- tests/wpt/mozilla/meta/MANIFEST.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index e5fcf55da15..ab86270ee13 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -18470,7 +18470,7 @@ "testharness" ], "mozilla/animation-removed-node.html": [ - "a2f9dfe284a22a6241290c86841172387dcdbeb6", + "d8845c873181c87cfde8bfdfbe31924ea6b73e59", "testharness" ], "mozilla/binding_keyword.html": [ @@ -18946,7 +18946,7 @@ "testharness" ], "mozilla/inline-event-listener-panic.html": [ - "2418893bc058666a018498dbf414faae2f22ffc5", + "acde98607ae4bfa19cf894ce7c81b2e6b7071e14", "testharness" ], "mozilla/inline_event_handler.html": [ @@ -18970,7 +18970,7 @@ "testharness" ], "mozilla/interfaces.js": [ - "786f6e12515ff71bc83f34e4ffa32e7e38b1cd26", + "c46c336f8a8a2db777f75d6236b1241c717a02dd", "support" ], "mozilla/interfaces.worker.js": [ @@ -19646,7 +19646,7 @@ "testharness" ], "mozilla/window_requestAnimationFrame2.html": [ - "237ef108c5ccaa842a165ee3a93df8fde1964b30", + "3227b28d5b249c683e8200cf70a6393181cec7f5", "testharness" ], "mozilla/window_resize_not_triggered_on_load.html": [