From 35db26d1a9c5d22f4c344f6be0405194cca52358 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 15 Nov 2017 13:33:08 -0500 Subject: [PATCH] Fix WPT lint errors. --- .../glsl/bugs/long-expressions-should-not-crash.html.ini | 8 -------- .../navigation-in-onload.tentative.html | 6 +++--- tests/wpt/web-platform-tests/lint.whitelist | 3 +++ 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/bugs/long-expressions-should-not-crash.html.ini diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/bugs/long-expressions-should-not-crash.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/bugs/long-expressions-should-not-crash.html.ini deleted file mode 100644 index d531648da6c..00000000000 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/bugs/long-expressions-should-not-crash.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[long-expressions-should-not-crash.html] - type: testharness - expected: - if os == "linux": CRASH - if os == "mac": TIMEOUT - [Overall test] - expected: NOTRUN - diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.tentative.html b/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.tentative.html index 3e021c65ac8..1b7183bd0ed 100644 --- a/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.tentative.html +++ b/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.tentative.html @@ -14,7 +14,7 @@ var t = async_test(); function scheduleNextTest() { - setTimeout(runNextTest, 0); + t.step_timeout(runNextTest, 0); } function runNextTest() { @@ -28,9 +28,9 @@ } function verify(actual, expected, desc) { - setTimeout(t.step_func(function() { + t.step_timeout(function() { assert_equals(actual, expected, desc); - }), 0); + }, 0); } diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist index 71e4998573f..3af7264598f 100644 --- a/tests/wpt/web-platform-tests/lint.whitelist +++ b/tests/wpt/web-platform-tests/lint.whitelist @@ -294,6 +294,7 @@ GENERATE_TESTS: shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/w GENERATE_TESTS: shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-003.html # Intentional use of setTimeout +SET TIMEOUT: html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-2.tentative.html SET TIMEOUT: html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html SET TIMEOUT: html/dom/documents/dom-tree-accessors/Document.currentScript.html SET TIMEOUT: html/webappapis/timers/* @@ -937,3 +938,5 @@ CONSOLE:payment-request/payment-request-response-id.html # Tests that use WebKit/Blink testing APIs LAYOUTTESTS APIS: css/css-regions/interactivity/* +# Test that uses the same names as the WebKit/Blink testing APIs +LAYOUTTESTS APIS: html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-2.tentative.html \ No newline at end of file