Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1796143) for causing mochitest failures on test_double_submit.html. CLOSED TREE

Browse Source 
Backed out changeset d02d2c2ad921 (bug 1796143)
Backed out changeset 680008b18ad1 (bug 1796143)
Backed out changeset 61a9ae6c1a8f (bug 1796143)
This commit is contained in:
Iulian Moraru 2022-10-20 22:59:56 +03:00
parent 0650f4e1b3
commit 7f78673181
10 changed files with 44 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docshell/test/mochitest/double_submit.sjs
View File

@ -2,9 +2,7 @@
let self = this;
let { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
let { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const CC = Components.Constructor;
const BinaryInputStream = CC(

4
dom/security/test/https-only/file_background_redirect.sjs
View File

@ -1,9 +1,7 @@
// Custom *.sjs file specifically for the needs of Bug 1683015
"use strict";
let { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
let { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
async function handleRequest(request, response) {
// avoid confusing cache behaviour

4
dom/serviceworkers/test/download_canceled/server-stream-download.sjs
View File

@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { setInterval, clearInterval } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
const { setInterval, clearInterval } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
// stolen from file_blocked_script.sjs

4
layout/generic/test/file_SlowTallImage.sjs
View File

@ -1,8 +1,6 @@
"use strict";
let { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
let { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
// A tall 1x1000 black png.
const IMG_BYTES = atob(

4
toolkit/components/alerts/test/image_server.sjs
View File

@ -1,8 +1,6 @@
const CC = Components.Constructor;
let { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
let { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const LocalFile = CC("@mozilla.org/file/local;1", "nsIFile", "initWithPath");

4
toolkit/components/extensions/test/mochitest/slow_response.sjs
View File

@ -4,8 +4,8 @@
/* eslint-disable no-unused-vars */
let { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
let { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const DELAY = AppConstants.DEBUG ? 4000 : 800;

4
toolkit/components/passwordmgr/test/browser/file_focus_before_DOMContentLoaded.sjs
View File

@ -6,9 +6,7 @@
const DELAY = 2 * 1000; // Delay two seconds before completing the request.
let { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
let { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
function handleRequest(request, response) {
response.processAsync();

4
toolkit/components/search/tests/xpcshell/data/searchSuggestions.sjs
View File

@ -1,9 +1,7 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
let { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
let { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
Cu.importGlobalProperties(["TextEncoder"]);

44
tools/esmify/mach_commands.py
View File

@ -198,12 +198,21 @@ class HgUtils(VCSUtils):
def find_all_jss(self, path):
jss = []
cmd = [
"hg",
"files",
f'set:glob:"{path}/**/*.jsm" or glob:"{path}/**/*.js" or '
+ f'glob:"{path}/**/*.mjs" or glob:"{path}/**/*.sjs"',
]
cmd = ["hg", "files", f'set:glob:"{path}/**/*.jsm"']
for line in self.run(cmd):
js = pathlib.Path(line)
if is_excluded_from_imports(js):
continue
jss.append(js)
cmd = ["hg", "files", f'set:glob:"{path}/**/*.js"']
for line in self.run(cmd):
js = pathlib.Path(line)
if is_excluded_from_imports(js):
continue
jss.append(js)
cmd = ["hg", "files", f'set:glob:"{path}/**/*.sys.mjs"']
for line in self.run(cmd):
js = pathlib.Path(line)
if is_excluded_from_imports(js):
@ -251,14 +260,21 @@ class GitUtils(VCSUtils):
def find_all_jss(self, path):
jss = []
cmd = [
"git",
"ls-files",
f"{path}/*.jsm",
f"{path}/*.js",
f"{path}/*.mjs",
f"{path}/*.sjs",
]
cmd = ["git", "ls-files", f"{path}/*.jsm"]
for line in self.run(cmd):
js = pathlib.Path(line)
if is_excluded_from_imports(js):
continue
jss.append(js)
cmd = ["git", "ls-files", f"{path}/*.js"]
for line in self.run(cmd):
js = pathlib.Path(line)
if is_excluded_from_imports(js):
continue
jss.append(js)
cmd = ["git", "ls-files", f"{path}/*.mjs"]
for line in self.run(cmd):
js = pathlib.Path(line)
if is_excluded_from_imports(js):

24
tools/esmify/map.json
View File

@ -41,8 +41,6 @@
"browser/components/pocket/content/pktApi.jsm",
"chrome://pocket/content/pktTelemetry.jsm":
"browser/components/pocket/content/pktTelemetry.jsm",
"chrome://remote/content/server/HTTPD.jsm":
"netwerk/test/httpserver/httpd.js",
"resource:///actors/ASRouterChild.jsm":
"browser/components/newtab/actors/ASRouterChild.jsm",
"resource:///actors/ASRouterParent.jsm":
@ -608,8 +606,6 @@
"browser/components/newtab/lib/DownloadsManager.jsm",
"resource://activity-stream/lib/FaviconFeed.jsm":
"browser/components/newtab/lib/FaviconFeed.jsm",
"resource://activity-stream/lib/FeatureCalloutMessages.jsm":
"browser/components/newtab/lib/FeatureCalloutMessages.jsm",
"resource://activity-stream/lib/FilterAdult.jsm":
"browser/components/newtab/lib/FilterAdult.jsm",
"resource://activity-stream/lib/HighlightsFeed.jsm":
@ -827,10 +823,10 @@
"toolkit/actors/BrowserElementChild.jsm",
"resource://gre/actors/BrowserElementParent.jsm":
"toolkit/actors/BrowserElementParent.jsm",
"resource://gre/actors/ClipboardReadPasteChild.jsm":
"toolkit/actors/ClipboardReadPasteChild.jsm",
"resource://gre/actors/ClipboardReadPasteParent.jsm":
"toolkit/actors/ClipboardReadPasteParent.jsm",
"resource://gre/actors/ClipboardReadTextPasteChild.jsm":
"toolkit/actors/ClipboardReadTextPasteChild.jsm",
"resource://gre/actors/ClipboardReadTextPasteParent.jsm":
"toolkit/actors/ClipboardReadTextPasteParent.jsm",
"resource://gre/actors/ContentMetaChild.jsm":
"toolkit/actors/ContentMetaChild.jsm",
"resource://gre/actors/ContentMetaParent.jsm":
@ -839,10 +835,6 @@
"toolkit/actors/ControllersChild.jsm",
"resource://gre/actors/ControllersParent.jsm":
"toolkit/actors/ControllersParent.jsm",
"resource://gre/actors/CookieBannerChild.jsm.jsm":
"toolkit/components/cookiebanners/CookieBannerChild.jsm.jsm",
"resource://gre/actors/CookieBannerParent.jsm":
"toolkit/components/cookiebanners/CookieBannerParent.jsm",
"resource://gre/actors/DateTimePickerChild.jsm":
"toolkit/actors/DateTimePickerChild.jsm",
"resource://gre/actors/DateTimePickerParent.jsm":
@ -1086,8 +1078,6 @@
"toolkit/components/extensions/ExtensionPreferencesManager.jsm",
"resource://gre/modules/ExtensionProcessScript.jsm":
"toolkit/components/extensions/ExtensionProcessScript.jsm",
"resource://gre/modules/ExtensionScriptingStore.jsm":
"toolkit/components/extensions/ExtensionScriptingStore.jsm",
"resource://gre/modules/ExtensionSearchHandler.jsm":
"toolkit/components/places/ExtensionSearchHandler.jsm",
"resource://gre/modules/ExtensionSettingsStore.jsm":
@ -1218,8 +1208,6 @@
"mobile/android/modules/geckoview/GeckoViewTab.jsm",
"resource://gre/modules/GeckoViewTelemetry.jsm":
"mobile/android/modules/geckoview/GeckoViewTelemetry.jsm",
"resource://gre/modules/GeckoViewTestUtils.jsm":
"mobile/android/modules/geckoview/GeckoViewTestUtils.jsm",
"resource://gre/modules/GeckoViewWebExtension.jsm":
"mobile/android/modules/geckoview/GeckoViewWebExtension.jsm",
"resource://gre/modules/Geometry.jsm": "toolkit/modules/Geometry.jsm",
@ -2099,14 +2087,10 @@
"toolkit/components/backgroundtasks/tests/BackgroundTask_shouldprocessupdates.jsm",
"resource://testing-common/backgroundtasks/BackgroundTask_wait.jsm":
"toolkit/components/backgroundtasks/tests/BackgroundTask_wait.jsm",
"resource://testing-common/cookie_filtering_helper.jsm":
"netwerk/test/browser/cookie_filtering_helper.jsm",
"resource://testing-common/dom/quota/test/modules/ModuleLoader.jsm":
"dom/quota/test/modules/system/ModuleLoader.jsm",
"resource://testing-common/dom/quota/test/modules/StorageUtils.jsm":
"dom/quota/test/modules/system/StorageUtils.jsm",
"resource://testing-common/dom/quota/test/modules/WorkerDriver.jsm":
"dom/quota/test/modules/system/WorkerDriver.jsm",
"resource://testing-common/early_hint_preload_test_helper.jsm":
"netwerk/test/browser/early_hint_preload_test_helper.jsm",
"resource://testing-common/httpd.js": "netwerk/test/httpserver/httpd.js",