diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /toolkit/xre/test/marionette | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/xre/test/marionette')
| -rw-r--r-- | toolkit/xre/test/marionette/gen_win32k_tests.py | 3 | ||||
| -rw-r--r-- | toolkit/xre/test/marionette/test_fission_autostart.py | 3 | ||||
| -rw-r--r-- | toolkit/xre/test/marionette/test_win32k_enrollment.py | 24 |
3 files changed, 10 insertions, 20 deletions
diff --git a/toolkit/xre/test/marionette/gen_win32k_tests.py b/toolkit/xre/test/marionette/gen_win32k_tests.py index e0a39776db..2b90cdcefe 100644 --- a/toolkit/xre/test/marionette/gen_win32k_tests.py +++ b/toolkit/xre/test/marionette/gen_win32k_tests.py @@ -58,8 +58,7 @@ def set_e10s(enable): if enable: output.write( """ - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null")\n""" ) else: diff --git a/toolkit/xre/test/marionette/test_fission_autostart.py b/toolkit/xre/test/marionette/test_fission_autostart.py index e34087aca9..40c083d00c 100644 --- a/toolkit/xre/test/marionette/test_fission_autostart.py +++ b/toolkit/xre/test/marionette/test_fission_autostart.py @@ -238,8 +238,7 @@ class TestFissionAutostart(MarionetteTestCase): decision="enabledByDefault", ) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.check_fission_status( enabled=False, decision="disabledByE10sEnv", diff --git a/toolkit/xre/test/marionette/test_win32k_enrollment.py b/toolkit/xre/test/marionette/test_win32k_enrollment.py index d09331319b..7aaad1b0cd 100644 --- a/toolkit/xre/test/marionette/test_win32k_enrollment.py +++ b/toolkit/xre/test/marionette/test_win32k_enrollment.py @@ -389,8 +389,7 @@ class TestWin32kAutostart(MarionetteTestCase): self.marionette.set_pref(Prefs.WIN32K, True) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null") self.check_win32k_status( @@ -623,8 +622,7 @@ class TestWin32kAutostart(MarionetteTestCase): self.marionette.set_pref(Prefs.WIN32K, True) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null") self.check_win32k_status( @@ -869,8 +867,7 @@ class TestWin32kAutostart(MarionetteTestCase): enrollmentStatusPref=ExperimentStatus.UNENROLLED, ) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null") self.check_win32k_status( @@ -1137,8 +1134,7 @@ class TestWin32kAutostart(MarionetteTestCase): enrollmentStatusPref=ExperimentStatus.UNENROLLED, ) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null") self.check_win32k_status( @@ -1366,8 +1362,7 @@ class TestWin32kAutostart(MarionetteTestCase): # Re-set enrollment pref, like Normandy would do self.set_enrollment_status(ExperimentStatus.ENROLLED_CONTROL) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null") self.check_win32k_status( @@ -1603,8 +1598,7 @@ class TestWin32kAutostart(MarionetteTestCase): # Re-set enrollment pref, like Normandy would do self.set_enrollment_status(ExperimentStatus.ENROLLED_CONTROL) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null") self.check_win32k_status( @@ -1853,8 +1847,7 @@ class TestWin32kAutostart(MarionetteTestCase): # Re-set enrollment pref, like Normandy would do self.set_enrollment_status(ExperimentStatus.ENROLLED_TREATMENT) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null") self.check_win32k_status( @@ -2103,8 +2096,7 @@ class TestWin32kAutostart(MarionetteTestCase): # Re-set enrollment pref, like Normandy would do self.set_enrollment_status(ExperimentStatus.ENROLLED_TREATMENT) - app_version = self.execute_script("return Services.appinfo.version") - self.restart(env={ENV_DISABLE_E10S: app_version}) + self.restart(env={ENV_DISABLE_E10S: "1"}) self.set_env(ENV_DISABLE_E10S, "null") self.check_win32k_status( |