summaryrefslogtreecommitdiffstats
path: root/toolkit/components/telemetry
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 03:41:35 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 03:41:35 +0000
commit2d861407bd7e9cc56fba8f2f763fe62dddb4da81 (patch)
tree32d9a69e31440af23173f321c975471ca10608c0 /toolkit/components/telemetry
parentReleasing progress-linux version 115.11.0esr-1~progress7.99u1. (diff)
downloadfirefox-esr-2d861407bd7e9cc56fba8f2f763fe62dddb4da81.tar.xz
firefox-esr-2d861407bd7e9cc56fba8f2f763fe62dddb4da81.zip
Merging upstream version 115.12.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/telemetry')
-rw-r--r--toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py
index c5bc54e9d2..9bcf29d2f4 100644
--- a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py
+++ b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py
@@ -55,6 +55,8 @@ class FOGTestCase(TelemetryTestCase):
"logging.fog_control::*": 5,
"logging.glean::*": 5,
"logging.glean_core::*": 5,
+ # Slow down the user inactivity timeout (bug 1690728)
+ "dom.events.user_interaction_interval": 60000,
}
)