David Heinemeier HanssonandClaude Opus 5.5
18328559b9
* Keep the Wi-Fi icon steady on OWE transition-mode networks An OWE transition-mode network pairs an open SSID with a hidden "_owetm_" twin on the same BSSID. Between scans NetworkManager reports the in-use access point under the hidden SSID and drops the active profile from the device's AvailableConnections, which is the only place Quickshell builds known networks from. No listed network is then connected, so the bar fell back to the disconnected icon until the next scan brought the open SSID back, flickering on and off while the link stayed up. Fall back to the Wi-Fi device's own connected state when no listed network is connected, and read the in-use access point's strength from nmcli (without a rescan) while the connected network has none of its own. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Discard stale in-use AP reads and key Wi-Fi checks on the device Bump a generation whenever the cached in-use access point strength stops describing the link (leaving Wi-Fi or a device change), and drop any nmcli read started before it, re-reading immediately instead of a full interval later. Key Wi-Fi connectivity checks on the device rather than the SSID, so the listed network coming and going with each scan on an OWE transition-mode network no longer schedules a check. A real network switch still passes through "disconnected". Add a QML fixture that runs the panel against a mocked device through the scan churn, a mid-read disconnect, and a final disconnect. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
59 lines
2.5 KiB
Bash
Executable File
59 lines
2.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
require_compositor "network OWE transition runtime test"
|
|
require_command quickshell
|
|
|
|
stage=$(mktemp -d)
|
|
trap 'rm -rf -- "$stage"' EXIT
|
|
fixture="$SHELL_TEST_DIR/fixtures/network-owe-transition"
|
|
mkdir -p "$stage/network" "$stage/bin" "$stage/home"
|
|
ln -s "$ROOT/shell/Ui" "$stage/Ui"
|
|
ln -s "$ROOT/shell/Commons" "$stage/Commons"
|
|
cp -r "$SHELL_TEST_DIR/fixtures/network-captive-portal/mocks" "$stage/mocks"
|
|
cp "$fixture/shell.qml" "$stage/shell.qml"
|
|
cp "$ROOT/shell/plugins/panels/network/Model.js" "$stage/network/Model.js"
|
|
node - "$ROOT" "$stage" <<'JS'
|
|
const fs = require('fs')
|
|
const [root, stage] = process.argv.slice(2)
|
|
let source = fs.readFileSync(`${root}/shell/plugins/panels/network/Panel.qml`, 'utf8')
|
|
// Replace only the singleton and expose the private poll in the disposable copy.
|
|
source = source.replace('import Quickshell.Networking', 'import Quickshell.Networking\nimport "../mocks"')
|
|
source = source.replace(/\bNetworking\./g, 'NetworkMock.')
|
|
source = source.replace(' id: root', ' id: root\n property alias testApPoll: activeApSignalPoll')
|
|
fs.writeFileSync(`${stage}/network/Panel.qml`, source)
|
|
JS
|
|
printf '#!/bin/bash\nexit 0\n' > "$stage/bin/noop"
|
|
chmod +x "$stage/bin/noop"
|
|
for command in omarchy-dns omarchy-network-band omarchy-network-status; do
|
|
ln -s noop "$stage/bin/$command"
|
|
done
|
|
# Answers in call order: 57, then a slow stale 11, then 33. Never touches the
|
|
# host's NetworkManager.
|
|
cat > "$stage/bin/nmcli" <<'SH'
|
|
#!/bin/bash
|
|
printf '%s\n' "$*" >> "$NETWORK_TEST_NMCLI_LOG"
|
|
count=$(wc -l < "$NETWORK_TEST_NMCLI_LOG")
|
|
case $count in
|
|
1) printf ' :82\n*:57\n' ;;
|
|
2) sleep 0.5; printf '*:11\n' ;;
|
|
*) printf ' :40\n*:33\n' ;;
|
|
esac
|
|
SH
|
|
chmod +x "$stage/bin/nmcli"
|
|
|
|
output=$(HOME="$stage/home" OMARCHY_PATH="$ROOT" PATH="$stage/bin:$PATH" \
|
|
NETWORK_TEST_NMCLI_LOG="$stage/nmcli.log" \
|
|
timeout 30 quickshell -p "$stage" --no-color 2>&1) || fail "network OWE fixture exits cleanly" "$output"
|
|
[[ $output == *"RESULT pass"* ]] || fail "network OWE runtime assertions pass" "$output"
|
|
if rg -q 'RESULT fail|ReferenceError|TypeError|Error:|Unable to assign|Binding loop' <<< "$output"; then
|
|
fail "network OWE fixture has no QML errors" "$output"
|
|
fi
|
|
while IFS= read -r args; do
|
|
[[ $args == "-t -f IN-USE,SIGNAL device wifi list ifname test-wifi --rescan no" ]] || fail "in-use access point read never rescans" "$args"
|
|
done < "$stage/nmcli.log"
|
|
pass "network keeps Wi-Fi through OWE transition scan churn, reads the in-use access point, and discards stale reads"
|