From 21a03ad73ca7ac2f4e4d923b380ee9695faea3a3 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Wed, 26 Jul 2017 09:08:07 -0400 Subject: [PATCH] Bug 1383120 - Enable no-arbitrary-setTimeout eslint rule on xpcshell tests, r=mossop MozReview-Commit-ID: 6DqLaZ9n5EM --HG-- extra : rebase_source : 5f1264bb3ea23005c91557e5db4ce5f9e167ce9a --- .../test/xpcshell/test_ext_browsingData_cookies_cache.js | 1 + browser/components/translation/test/unit/test_cld2.js | 1 + browser/experiments/test/xpcshell/test_cacherace.js | 1 + .../extensions/formautofill/test/unit/test_autofillFormFields.js | 1 + .../server/tests/unit/test_promises_object_timetosettle-02.js | 1 + devtools/shared/discovery/tests/unit/test_discovery.js | 1 + dom/indexedDB/test/unit/test_database_close_without_onclose.js | 1 + dom/indexedDB/test/unit/test_idle_maintenance.js | 1 + dom/indexedDB/test/unit/test_temporary_storage.js | 1 + dom/indexedDB/test/unit/test_writer_starvation.js | 1 + toolkit/components/extensions/test/xpcshell/test_ext_alarms.js | 1 + .../extensions/test/xpcshell/test_ext_alarms_does_not_fire.js | 1 + .../extensions/test/xpcshell/test_ext_alarms_periodic.js | 1 + toolkit/components/promiseworker/tests/xpcshell/test_Promise.js | 1 + toolkit/components/search/tests/xpcshell/test_searchSuggest.js | 1 + toolkit/components/telemetry/tests/unit/test_PingSender.js | 1 + .../terminator/tests/xpcshell/test_terminator_record.js | 1 + toolkit/modules/subprocess/test/xpcshell/test_subprocess.js | 1 + toolkit/modules/tests/xpcshell/test_GMPInstallManager.js | 1 + toolkit/modules/tests/xpcshell/test_PromiseUtils.js | 1 + .../eslint/eslint-plugin-mozilla/lib/configs/xpcshell-test.js | 1 + 21 files changed, 21 insertions(+) diff --git a/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js b/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js index effd40ea1a89..34207ff658e3 100644 --- a/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js +++ b/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js @@ -1,5 +1,6 @@ /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */ /* vim: set sts=2 sw=2 et tw=80: */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; XPCOMUtils.defineLazyModuleGetter(this, "setTimeout", diff --git a/browser/components/translation/test/unit/test_cld2.js b/browser/components/translation/test/unit/test_cld2.js index c708872bb74b..5fb22daa3d55 100644 --- a/browser/components/translation/test/unit/test_cld2.js +++ b/browser/components/translation/test/unit/test_cld2.js @@ -17,6 +17,7 @@ // // Unit test compact language detector, CLD2 // +/* eslint-disable mozilla/no-arbitrary-setTimeout */ // Test strings. const kTeststr_en = diff --git a/browser/experiments/test/xpcshell/test_cacherace.js b/browser/experiments/test/xpcshell/test_cacherace.js index 48ba7327d8ff..176c83569cca 100644 --- a/browser/experiments/test/xpcshell/test_cacherace.js +++ b/browser/experiments/test/xpcshell/test_cacherace.js @@ -1,5 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; diff --git a/browser/extensions/formautofill/test/unit/test_autofillFormFields.js b/browser/extensions/formautofill/test/unit/test_autofillFormFields.js index f41fa67f8dd6..0c4d68a9a7b2 100644 --- a/browser/extensions/formautofill/test/unit/test_autofillFormFields.js +++ b/browser/extensions/formautofill/test/unit/test_autofillFormFields.js @@ -1,6 +1,7 @@ /* * Test for form auto fill content helper fill all inputs function. */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; diff --git a/devtools/server/tests/unit/test_promises_object_timetosettle-02.js b/devtools/server/tests/unit/test_promises_object_timetosettle-02.js index 10224d0b99b1..8e399bf9da03 100644 --- a/devtools/server/tests/unit/test_promises_object_timetosettle-02.js +++ b/devtools/server/tests/unit/test_promises_object_timetosettle-02.js @@ -1,5 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ /** * Test that we get the expected settlement time for promise time to settle. diff --git a/devtools/shared/discovery/tests/unit/test_discovery.js b/devtools/shared/discovery/tests/unit/test_discovery.js index 56b0bc1e7c94..f8f632277b18 100644 --- a/devtools/shared/discovery/tests/unit/test_discovery.js +++ b/devtools/shared/discovery/tests/unit/test_discovery.js @@ -1,5 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; diff --git a/dom/indexedDB/test/unit/test_database_close_without_onclose.js b/dom/indexedDB/test/unit/test_database_close_without_onclose.js index d0a9b7d73479..e371a976d019 100644 --- a/dom/indexedDB/test/unit/test_database_close_without_onclose.js +++ b/dom/indexedDB/test/unit/test_database_close_without_onclose.js @@ -2,6 +2,7 @@ * Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ var testGenerator = testSteps(); diff --git a/dom/indexedDB/test/unit/test_idle_maintenance.js b/dom/indexedDB/test/unit/test_idle_maintenance.js index 595e92746e6c..cbed0221f11e 100644 --- a/dom/indexedDB/test/unit/test_idle_maintenance.js +++ b/dom/indexedDB/test/unit/test_idle_maintenance.js @@ -2,6 +2,7 @@ * Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ var testGenerator = testSteps(); diff --git a/dom/indexedDB/test/unit/test_temporary_storage.js b/dom/indexedDB/test/unit/test_temporary_storage.js index 3d0e21c4eb4c..6139098cc1d3 100644 --- a/dom/indexedDB/test/unit/test_temporary_storage.js +++ b/dom/indexedDB/test/unit/test_temporary_storage.js @@ -2,6 +2,7 @@ * Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ var testGenerator = testSteps(); diff --git a/dom/indexedDB/test/unit/test_writer_starvation.js b/dom/indexedDB/test/unit/test_writer_starvation.js index 40def18e70d9..10c07b1a0c86 100644 --- a/dom/indexedDB/test/unit/test_writer_starvation.js +++ b/dom/indexedDB/test/unit/test_writer_starvation.js @@ -2,6 +2,7 @@ * Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ if (!this.window) { this.runTest = function() { diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js b/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js index 5dd66839c9be..6aa0d72b12d7 100644 --- a/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js +++ b/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js @@ -1,5 +1,6 @@ /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */ /* vim: set sts=2 sw=2 et tw=80: */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; add_task(async function test_alarm_without_permissions() { diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_does_not_fire.js b/toolkit/components/extensions/test/xpcshell/test_ext_alarms_does_not_fire.js index 1816f2484eac..5df2ffa6358b 100644 --- a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_does_not_fire.js +++ b/toolkit/components/extensions/test/xpcshell/test_ext_alarms_does_not_fire.js @@ -1,5 +1,6 @@ /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */ /* vim: set sts=2 sw=2 et tw=80: */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; add_task(async function test_cleared_alarm_does_not_fire() { diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_periodic.js b/toolkit/components/extensions/test/xpcshell/test_ext_alarms_periodic.js index 179b2a3aadd0..7c7629a16a05 100644 --- a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_periodic.js +++ b/toolkit/components/extensions/test/xpcshell/test_ext_alarms_periodic.js @@ -1,5 +1,6 @@ /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */ /* vim: set sts=2 sw=2 et tw=80: */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; add_task(async function test_periodic_alarm_fires() { diff --git a/toolkit/components/promiseworker/tests/xpcshell/test_Promise.js b/toolkit/components/promiseworker/tests/xpcshell/test_Promise.js index 9313f2ed1e05..ffa614d52564 100644 --- a/toolkit/components/promiseworker/tests/xpcshell/test_Promise.js +++ b/toolkit/components/promiseworker/tests/xpcshell/test_Promise.js @@ -1,5 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; diff --git a/toolkit/components/search/tests/xpcshell/test_searchSuggest.js b/toolkit/components/search/tests/xpcshell/test_searchSuggest.js index e3e9caec38fd..1289e4e13cdb 100644 --- a/toolkit/components/search/tests/xpcshell/test_searchSuggest.js +++ b/toolkit/components/search/tests/xpcshell/test_searchSuggest.js @@ -1,5 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ /** * Testing search suggestions from SearchSuggestionController.jsm. diff --git a/toolkit/components/telemetry/tests/unit/test_PingSender.js b/toolkit/components/telemetry/tests/unit/test_PingSender.js index 676a8ab0701d..ab887e94d6a7 100644 --- a/toolkit/components/telemetry/tests/unit/test_PingSender.js +++ b/toolkit/components/telemetry/tests/unit/test_PingSender.js @@ -1,6 +1,7 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ // This tests submitting a ping using the stand-alone pingsender program. diff --git a/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js b/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js index 7a518b896484..ceb93751daea 100644 --- a/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js +++ b/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js @@ -1,5 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; diff --git a/toolkit/modules/subprocess/test/xpcshell/test_subprocess.js b/toolkit/modules/subprocess/test/xpcshell/test_subprocess.js index a67c1f57f204..e79cf757dba3 100644 --- a/toolkit/modules/subprocess/test/xpcshell/test_subprocess.js +++ b/toolkit/modules/subprocess/test/xpcshell/test_subprocess.js @@ -1,3 +1,4 @@ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; Cu.import("resource://gre/modules/AppConstants.jsm"); diff --git a/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js b/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js index 1696cc1265d6..cbe22b3f6b50 100644 --- a/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js +++ b/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js @@ -1,5 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ var {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, manager: Cm} = Components; const URL_HOST = "http://localhost"; diff --git a/toolkit/modules/tests/xpcshell/test_PromiseUtils.js b/toolkit/modules/tests/xpcshell/test_PromiseUtils.js index be461f3ae127..0e88378fd1c8 100644 --- a/toolkit/modules/tests/xpcshell/test_PromiseUtils.js +++ b/toolkit/modules/tests/xpcshell/test_PromiseUtils.js @@ -1,5 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ "use strict"; diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/xpcshell-test.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/xpcshell-test.js index 08256c08b42c..aaaec3919314 100644 --- a/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/xpcshell-test.js +++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/xpcshell-test.js @@ -69,6 +69,7 @@ module.exports = { rules: { "mozilla/import-headjs-globals": "warn", "mozilla/mark-test-function-used": "warn", + "mozilla/no-arbitrary-setTimeout": "error", "no-shadow": "error" } };