Paulo Geyer
14921a956e
idle.screensaver / idle.lock of 0 was included in Math.min(), so IdleMonitor's timeout became 0. Releasing a Wayland idle inhibitor (SDL's default screensaver inhibit) then reported idle immediately and locked the session even when lock had been "disabled" by setting it to 0. Treat 0 as disabled when computing the first idle deadline, do not start the corresponding action, and leave IdleMonitor off when both timeouts are 0. Fixes #10860
78 lines
3.3 KiB
Bash
78 lines
3.3 KiB
Bash
#!/bin/bash
|
|
|
|
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'
|
|
)
|
|
|
|
assertDeepEqual(idle.eventParts({ data: 'a,b,c' }, 2), ['a', 'b', 'c'], 'idle parses raw event data')
|
|
assertDeepEqual(
|
|
idle.eventParts({ parse: function(count) { return ['parsed', count] } }, 4),
|
|
['parsed', 4],
|
|
'idle prefers event parser when available'
|
|
)
|
|
|
|
assertDeepEqual(
|
|
idle.screensaverWindowsAfter({ a: true }, 'b', true),
|
|
{ windows: { a: true, b: true }, count: 2 },
|
|
'idle adds visible screensaver windows'
|
|
)
|
|
assertDeepEqual(
|
|
idle.screensaverWindowsAfter({ a: true, b: true }, 'a', false),
|
|
{ windows: { b: true }, count: 1 },
|
|
'idle removes closed screensaver windows'
|
|
)
|
|
assertDeepEqual(
|
|
idle.screensaverWindowsAfter({ a: true }, '', false),
|
|
{ windows: { a: true }, count: 1 },
|
|
'idle leaves screensaver windows unchanged without an address'
|
|
)
|
|
JS
|
|
|
|
test_tmp=$(mktemp -d)
|
|
trap 'rm -rf "$test_tmp"' EXIT
|
|
|
|
test_home="$test_tmp/home"
|
|
mkdir -p "$test_home"
|
|
|
|
HOME="$test_home" "$ROOT/bin/omarchy-toggle-idle" stay-awake >/dev/null
|
|
[[ -f $test_home/.local/state/omarchy/indicators/stay-awake ]] || fail "Stay Awake toggle persists enabled state"
|
|
|
|
HOME="$test_home" "$ROOT/bin/omarchy-toggle-idle" allow-idle >/dev/null
|
|
[[ ! -f $test_home/.local/state/omarchy/indicators/stay-awake ]] || fail "Stay Awake toggle persists disabled state"
|
|
|
|
if rg -q 'omarchy-shell' "$ROOT/bin/omarchy-toggle-idle"; then
|
|
fail "Stay Awake toggle avoids reentrant shell IPC"
|
|
fi
|
|
|
|
pass "Stay Awake toggle persists state without reentrant shell IPC"
|