Bug 1878110 - Change marionette based tests to import ES modules directly. r=arai,webdriver-reviewers,jgraham,application-update-reviewers,bytesized,migration-reviewers,mconley

Standard8 · Standard8 · commit 68faaa0166eb · 2024-02-23T18:39:31.000Z
Differential Revision: https://phabricator.services.mozilla.com/D200373
diff --git a/browser/components/migration/tests/marionette/test_refresh_firefox.py b/browser/components/migration/tests/marionette/test_refresh_firefox.py
@@ -224,8 +224,8 @@ def createFxa(self):
         self.runAsyncCode(
             """
           let resolve = arguments[arguments.length - 1];
-          let { FxAccountsStorageManager } = ChromeUtils.import(
-            "resource://gre/modules/FxAccountsStorage.jsm"
+          let { FxAccountsStorageManager } = ChromeUtils.importESModule(
+            "resource://gre/modules/FxAccountsStorage.sys.mjs"
           );
           let storage = new FxAccountsStorageManager();
           let data = {email: "test@test.com", uid: "uid", keyFetchToken: "top-secret"};
@@ -448,8 +448,8 @@ def checkSession(self):
     def checkFxA(self):
         result = self.runAsyncCode(
             """
-          let { FxAccountsStorageManager } = ChromeUtils.import(
-            "resource://gre/modules/FxAccountsStorage.jsm"
+          let { FxAccountsStorageManager } = ChromeUtils.importESModule(
+            "resource://gre/modules/FxAccountsStorage.sys.mjs"
           );
           let resolve = arguments[arguments.length - 1];
           let storage = new FxAccountsStorageManager();
@@ -528,16 +528,16 @@ def setUpScriptData(self):
           global.Preferences = ChromeUtils.importESModule(
             "resource://gre/modules/Preferences.sys.mjs"
           ).Preferences;
-          global.FormHistory = ChromeUtils.import(
-            "resource://gre/modules/FormHistory.jsm"
+          global.FormHistory = ChromeUtils.importESModule(
+            "resource://gre/modules/FormHistory.sys.mjs"
           ).FormHistory;
         """  # NOQA: E501
         )
         self._formAutofillAvailable = self.runCode(
             """
           try {
-            global.formAutofillStorage = ChromeUtils.import(
-              "resource://formautofill/FormAutofillStorage.jsm"
+            global.formAutofillStorage = ChromeUtils.importESModule(
+              "resource://formautofill/FormAutofillStorage.sys.mjs"
             ).formAutofillStorage;
           } catch(e) {
             return false;
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_addons.py b/testing/marionette/harness/marionette_harness/tests/unit/test_addons.py
@@ -32,8 +32,8 @@ def all_addon_ids(self):
             addons = self.marionette.execute_async_script(
                 """
               const [resolve] = arguments;
-              const { AddonManager } = ChromeUtils.import(
-                "resource://gre/modules/AddonManager.jsm"
+              const { AddonManager } = ChromeUtils.importESModule(
+                "resource://gre/modules/AddonManager.sys.mjs"
               );
 
               async function getAllAddons() {
@@ -54,8 +54,8 @@ def reset_addons(self):
                 addon_id = self.marionette.execute_async_script(
                     """
                   const [addonId, resolve] = arguments;
-                  const { AddonManager } = ChromeUtils.import(
-                    "resource://gre/modules/AddonManager.jsm"
+                  const { AddonManager } = ChromeUtils.importESModule(
+                    "resource://gre/modules/AddonManager.sys.mjs"
                   );
 
                   async function uninstall() {
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -548,7 +548,9 @@ def setup(self):
             return
 
         script = """
-            const {PerTestCoverageUtils} = ChromeUtils.import("chrome://remote/content/marionette/PerTestCoverageUtils.jsm");
+            const {PerTestCoverageUtils} = ChromeUtils.importESModule(
+                "chrome://remote/content/marionette/PerTestCoverageUtils.sys.mjs"
+            );
             return PerTestCoverageUtils.enabled;
             """
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
@@ -558,7 +560,9 @@ def reset(self):
         script = """
             var callback = arguments[arguments.length - 1];
 
-            const {PerTestCoverageUtils} = ChromeUtils.import("chrome://remote/content/marionette/PerTestCoverageUtils.jsm");
+            const {PerTestCoverageUtils} = ChromeUtils.importESModule(
+                "chrome://remote/content/marionette/PerTestCoverageUtils.sys.mjs"
+            );
             PerTestCoverageUtils.beforeTest().then(callback, callback);
             """
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
@@ -578,7 +582,9 @@ def dump(self):
         script = """
             var callback = arguments[arguments.length - 1];
 
-            const {PerTestCoverageUtils} = ChromeUtils.import("chrome://remote/content/marionette/PerTestCoverageUtils.jsm");
+            const {PerTestCoverageUtils} = ChromeUtils.importESModule(
+                "chrome://remote/content/marionette/PerTestCoverageUtils.sys.mjs"
+            );
             PerTestCoverageUtils.afterTest().then(callback, callback);
             """
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
@@ -695,11 +701,9 @@ def setup(self):
 
     def load_devtools(self):
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
-            # Once ESR is 107 is released, we can replace the ChromeUtils.import(DevToolsShim.jsm)
-            # with ChromeUtils.importESModule(DevToolsShim.sys.mjs) in this snippet:
             self.parent.base.execute_script("""
-const { DevToolsShim } = ChromeUtils.import(
-  "chrome://devtools-startup/content/DevToolsShim.jsm"
+const { DevToolsShim } = ChromeUtils.importESModule(
+  "chrome://devtools-startup/content/DevToolsShim.sys.mjs"
 );
 
 const callback = arguments[arguments.length - 1];
diff --git a/testing/webcompat/fixtures.py b/testing/webcompat/fixtures.py
@@ -171,11 +171,11 @@ def install_addon(session, addon_file_path):
         """
         const addon_file_path = arguments[0];
         const cb = arguments[1];
-        const { AddonManager } = ChromeUtils.import(
-            "resource://gre/modules/AddonManager.jsm"
+        const { AddonManager } = ChromeUtils.importESModule(
+            "resource://gre/modules/AddonManager.sys.mjs"
         );
-        const { ExtensionPermissions } = ChromeUtils.import(
-            "resource://gre/modules/ExtensionPermissions.jsm"
+        const { ExtensionPermissions } = ChromeUtils.importESModule(
+            "resource://gre/modules/ExtensionPermissions.sys.mjs"
         );
         const { FileUtils } = ChromeUtils.importESModule(
             "resource://gre/modules/FileUtils.sys.mjs"
diff --git a/testing/xpcshell/selftest.py b/testing/xpcshell/selftest.py
@@ -288,7 +288,9 @@
 # A test that crashes outright.
 TEST_CRASHING = """
 function run_test () {
-  const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
+  const { ctypes } = ChromeUtils.importESModule(
+    "resource://gre/modules/ctypes.sys.mjs"
+  );
   let zero = new ctypes.intptr_t(8);
   let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
   badptr.contents;
diff --git a/toolkit/components/telemetry/tests/integration/tests/conftest.py b/toolkit/components/telemetry/tests/integration/tests/conftest.py
@@ -127,8 +127,8 @@ def get_client_id(self):
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             return self.marionette.execute_script(
                 """\
-                const { ClientID } = ChromeUtils.import(
-                  "resource://gre/modules/ClientID.jsm"
+                const { ClientID } = ChromeUtils.importESModule(
+                  "resource://gre/modules/ClientID.sys.mjs"
                 );
                 return ClientID.getCachedClientID();
             """
@@ -165,8 +165,8 @@ def install_addon(self):
             # triggers an "environment-change" ping.
             script = """\
                     let [resolve] = arguments;
-            const { TelemetryEnvironment } = ChromeUtils.import(
-              "resource://gre/modules/TelemetryEnvironment.jsm"
+            const { TelemetryEnvironment } = ChromeUtils.importESModule(
+              "resource://gre/modules/TelemetryEnvironment.sys.mjs"
             );
             TelemetryEnvironment.onInitialized().then(resolve);
             """
diff --git a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
@@ -175,8 +175,8 @@ def _install_addon(self, addon_name, temp=True):
             # triggers an "environment-change" ping.
             script = """\
             let [resolve] = arguments;
-            const { TelemetryEnvironment } = ChromeUtils.import(
-              "resource://gre/modules/TelemetryEnvironment.jsm"
+            const { TelemetryEnvironment } = ChromeUtils.importESModule(
+              "resource://gre/modules/TelemetryEnvironment.sys.mjs"
             );
             TelemetryEnvironment.onInitialized().then(resolve);
             """
@@ -205,8 +205,8 @@ def client_id(self):
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             return self.marionette.execute_script(
                 """\
-                const { ClientID } = ChromeUtils.import(
-                  "resource://gre/modules/ClientID.jsm"
+                const { ClientID } = ChromeUtils.importESModule(
+                  "resource://gre/modules/ClientID.sys.mjs"
                 );
                 return ClientID.getCachedClientID();
                 """
@@ -218,8 +218,8 @@ def subsession_id(self):
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             ping_data = self.marionette.execute_script(
                 """\
-                const { TelemetryController } = ChromeUtils.import(
-                  "resource://gre/modules/TelemetryController.jsm"
+                const { TelemetryController } = ChromeUtils.importESModule(
+                  "resource://gre/modules/TelemetryController.sys.mjs"
                 );
                 return TelemetryController.getCurrentPingData(true);
                 """
diff --git a/toolkit/components/telemetry/tests/marionette/tests/client/test_deletion_request_ping.py b/toolkit/components/telemetry/tests/marionette/tests/client/test_deletion_request_ping.py
@@ -55,8 +55,8 @@ def test_deletion_request_ping_across_sessions(self):
             return self.marionette.execute_async_script(
                 """
                 let [resolve] = arguments;
-                const { ClientID } = ChromeUtils.import(
-                  "resource://gre/modules/ClientID.jsm"
+                const { ClientID } = ChromeUtils.importESModule(
+                  "resource://gre/modules/ClientID.sys.mjs"
                 );
                 ClientID.getClientID().then(resolve);
                 """,
diff --git a/toolkit/components/telemetry/tests/marionette/tests/client/test_main_tab_scalars.py b/toolkit/components/telemetry/tests/marionette/tests/client/test_main_tab_scalars.py
@@ -20,8 +20,8 @@ def test_main_tab_scalars(self):
             # test.
             self.marionette.execute_script(
                 """
-                const { BrowserUsageTelemetry } = ChromeUtils.import(
-                    "resource:///modules/BrowserUsageTelemetry.jsm"
+                const { BrowserUsageTelemetry } = ChromeUtils.importESModule(
+                    "resource:///modules/BrowserUsageTelemetry.sys.mjs"
                 );
 
                 BrowserUsageTelemetry._onTabsOpenedTask._timeoutMs = 0;
diff --git a/toolkit/mozapps/update/tests/marionette/test_no_window_update_restart.py b/toolkit/mozapps/update/tests/marionette/test_no_window_update_restart.py
@@ -162,7 +162,9 @@ def resetUpdate(self):
             let UM = Cc["@mozilla.org/updates/update-manager;1"].getService(Ci.nsIUpdateManager);
             UM.QueryInterface(Ci.nsIObserver).observe(null, "um-reload-update-data", "skip-files");
 
-            let { UpdateListener } = ChromeUtils.import("resource://gre/modules/UpdateListener.jsm");
+            let { UpdateListener } = ChromeUtils.importESModule(
+                "resource://gre/modules/UpdateListener.sys.mjs"
+            );
             UpdateListener.reset();
 
             let { AppMenuNotifications } = ChromeUtils.importESModule(
