summaryrefslogtreecommitdiffstats
path: root/testing/talos
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-27 11:49:31 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-27 11:49:31 +0100
commit71416f9b79e10559f412d8b03eb65446693d8ae1 (patch)
tree1126c76cefbf8c3fbfdfd153c3650fe457e6825a /testing/talos
parentd56573bb9c88295d9bd6d86658c4124c0c4b3e2d (diff)
parent90773547e74b5c03a5bb60b9c156f987c73b3dcc (diff)
downloadUXP-71416f9b79e10559f412d8b03eb65446693d8ae1.tar
UXP-71416f9b79e10559f412d8b03eb65446693d8ae1.tar.gz
UXP-71416f9b79e10559f412d8b03eb65446693d8ae1.tar.lz
UXP-71416f9b79e10559f412d8b03eb65446693d8ae1.tar.xz
UXP-71416f9b79e10559f412d8b03eb65446693d8ae1.zip
Merge branch '1360'
Diffstat (limited to 'testing/talos')
-rw-r--r--testing/talos/talos/test.py4
-rw-r--r--testing/talos/talos/ttest.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/testing/talos/talos/test.py b/testing/talos/talos/test.py
index dc1306b8e..6df5835bb 100644
--- a/testing/talos/talos/test.py
+++ b/testing/talos/talos/test.py
@@ -556,8 +556,8 @@ class basic_compositor_video(PageloaderTest):
sps_profile_interval = 1
sps_profile_entries = 2000000
preferences = {'full-screen-api.allow-trusted-requests-only': False,
- 'layers.acceleration.force-enabled': False,
- 'layers.acceleration.disabled': True,
+ 'layers.acceleration.force': False,
+ 'layers.acceleration.enabled': False,
'layout.frame_rate': 0,
'docshell.event_starvation_delay_hint': 1,
'full-screen-api.warning.timeout': 500,
diff --git a/testing/talos/talos/ttest.py b/testing/talos/talos/ttest.py
index 4a0fcd135..3c57f020d 100644
--- a/testing/talos/talos/ttest.py
+++ b/testing/talos/talos/ttest.py
@@ -64,7 +64,7 @@ class TTest(object):
# Bug 1262954: winxp + e10s, disable hwaccel
if self.platform_type == "win_" and browser_config['e10s']:
prefs = browser_config['preferences']
- prefs['layers.acceleration.disabled'] = True
+ prefs['layers.acceleration.enabled'] = False
with FFSetup(browser_config, test_config) as setup:
return self._runTest(browser_config, test_config, setup)