diff options
Diffstat (limited to 'toolkit/components/telemetry/tests/marionette/harness')
| -rw-r--r-- | toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/runner.py | 3 | ||||
| -rw-r--r-- | toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/runner.py b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/runner.py index 37a91023ce..29b03e4f55 100644 --- a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/runner.py +++ b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/runner.py @@ -52,6 +52,9 @@ class TelemetryTestRunner(BaseMarionetteTestRunner): # Disable Normandy a little harder (bug 1608807). # This should also disable Nimbus. "app.shield.optoutstudies.enabled": False, + # Bug 1789727: Keep the screenshots extension disabled to avoid + # disabling the addon resulting in extra subsessions + "screenshots.browser.component.enabled": False, } ) diff --git a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py index d30fd67986..91d0336975 100644 --- 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 @@ class TelemetryTestCase(WindowManagerMixin, MarionetteTestCase): # 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 @@ class TelemetryTestCase(WindowManagerMixin, MarionetteTestCase): 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 @@ class TelemetryTestCase(WindowManagerMixin, MarionetteTestCase): 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); """ |