Merge pull request #12538 from paulogeyer/fix/10860-idle-timeout-zero

Treat idle timeout 0 as disabled, not immediate

test/shell.d/idle-test.sh

@@ -5,11 +5,56 @@ set -euo pipefail
 source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
 
 run_node_test <<'JS'
+const fs = require('fs')
 const idle = requireFromRoot('shell/plugins/services/idle/IdleModel.js')
+const serviceSource = fs.readFileSync(root + '/shell/plugins/services/idle/Service.qml', 'utf8')
 
 assertEqual(idle.secondsFromConfig('42.9', 10), 42, 'idle floors configured seconds')
 assertEqual(idle.secondsFromConfig('-1', 10), 10, 'idle rejects negative seconds')
 assertEqual(idle.secondsFromConfig('nope', 10), 10, 'idle rejects invalid seconds')
+assertEqual(idle.secondsFromConfig(0, 300), 0, 'idle keeps an explicit zero timeout')
+assertEqual(idle.firstIdleTimeout(150, 300), 150, 'idle uses the sooner of screensaver and lock')
+assertEqual(idle.firstIdleTimeout(0, 300), 300, 'idle ignores a disabled screensaver when computing first idle')
+assertEqual(idle.firstIdleTimeout(150, 0), 150, 'idle ignores a disabled lock when computing first idle')
+assertEqual(idle.firstIdleTimeout(0, 0), 0, 'idle has no first-idle timeout when both actions are disabled')
+assertEqual(idle.delayAfterFirstIdle(300, 150), 150, 'idle delays lock until its own timeout')
+assertEqual(idle.delayAfterFirstIdle(150, 150), 0, 'idle fires an action immediately when it is the first timeout')
+assertEqual(idle.delayAfterFirstIdle(0, 150), 0, 'idle does not schedule a disabled action')
+
+assert(
+  serviceSource.includes('IdleModel.firstIdleTimeout(screensaverTimeoutSeconds, lockTimeoutSeconds)'),
+  'idle ignores a zero timeout when computing the first idle deadline'
+)
+assert(
+  /enabled: root\.idleEnabled && root\.idleTimersEnabled/.test(serviceSource),
+  'idle monitor is off when both screensaver and lock are disabled'
+)
+assert(
+  /if \(root\.lockEnabled\) \{\s*\n\s*if \(root\.lockDelaySeconds === 0\) lockSystem/.test(serviceSource),
+  'idle does not lock immediately when lock timeout is disabled'
+)
+assert(
+  /id: screensaverTimer[\s\S]*?onTriggered: if \(root\.screensaverEnabled\) root\.launchScreensaver\(\)/.test(serviceSource),
+  'idle does not launch a pending screensaver once its timeout is set to 0'
+)
+assert(
+  /id: lockTimer[\s\S]*?onTriggered: if \([^)]*root\.lockEnabled\) root\.lockSystem\("lock-timeout"\)/.test(serviceSource),
+  'idle does not fire a pending lock once its timeout is set to 0'
+)
+assert(
+  /lockTimer\.interval = root\.lockDelaySeconds \* 1000\s*\n\s*lockTimer\.restart\(\)/.test(serviceSource) &&
+    !/interval: root\.lockDelaySeconds/.test(serviceSource),
+  'idle keeps a pending lock on its deadline when shell.json changes mid-cycle'
+)
+assert(
+  /screensaverTimer\.interval = root\.screensaverDelaySeconds \* 1000\s*\n\s*screensaverTimer\.restart\(\)/.test(serviceSource) &&
+    !/interval: root\.screensaverDelaySeconds/.test(serviceSource),
+  'idle keeps a pending screensaver on its deadline when shell.json changes mid-cycle'
+)
+assert(
+  /onIdleTimersEnabledChanged: if \(!idleTimersEnabled\) cancelIdleCycle\(/.test(serviceSource),
+  'idle ends a running cycle when both timeouts are set to 0'
+)
 
 assertDeepEqual(idle.eventParts({ data: 'a,b,c' }, 2), ['a', 'b', 'c'], 'idle parses raw event data')
 assertDeepEqual(