Skip to content

friglet-tray: drop duplicate test fakes and tests (SNB-672) - #51

Closed
setavenger wants to merge 3 commits into
integrationfrom
snb-672-tray-test-dedup
Closed

setavenger wants to merge 3 commits into
integrationfrom
snb-672-tray-test-dedup

Conversation

@setavenger

Copy link
Copy Markdown
Owner

Stacked on #48; review only the commits after it.

Implements SNB-672. Net −65 lines (7 added, 72 removed).

What was removed and why it was duplicated

  • lib.rs tests: spawn_fake_daemon / spawn_fake_daemon_owned were a second fake daemon next to spawn_stoppable_fake_daemon. They differed only in canned GetStatus fields that no test reads (height, network, version, pid, scan state). Their four users (retry_keeps_child_when_socket_reachable, retry_reattaches_after_child_exited, attach_adopts_daemons_self_reported_ownership, supervisor_records_crash_and_schedules_restart) never send Shutdown and never check the pid. They now use spawn_stoppable_fake_daemon with the same spawned_by_tray answer as before.
  • tests/lifecycle_e2e.rs: dropped attaches_when_daemon_already_running. attach_carries_daemons_self_reported_ownership covers the same path: it attaches through attach_or_spawn_with with a locator that panics if it is consulted, then also checks the ownership carried through.

Why behaviour is unchanged

Test-only change. Every remaining test asserts what it did before, and the attach path keeps its e2e coverage.

Verification

  • cargo check --workspace --all-targets --all-features: 0 warnings.
  • cargo clippy --no-deps -p friglet -p friglet-ipc -p friglet-tray --all-targets -- -D warnings: clean.
  • cargo fmt -p friglet -p friglet-ipc -p friglet-tray -- --check: clean.
  • cargo test --workspace: 251 passed, 1 ignored, 0 failed. That is friglet-tray: remove dead commands, lifecycle API and UI leftovers (SNB-667) #48's 252 minus the removed duplicate attaches_when_daemon_already_running. friglet-tray: lib 65 passed, e2e 8 passed.

setavenger and others added 3 commits October 3, 2026 08:46
Three lifecycle e2e tests wrote a shell script to a temp dir and then ran
it as the "daemon binary". The test harness runs tests on parallel
threads of one process, so another test's spawn could fork while the
script was still open for writing; the forked child holds that write
handle until it execs, and running the script in that window fails with
"Text file busy" (ETXTBSY, os error 26).

The scripts are now committed as executable fixtures under
friglet-tray/tests/fixtures/ and located via CARGO_MANIFEST_DIR, so
nothing is written while the tests run. The long-running fixture uses
`exec sleep 30`, so killing the spawned child no longer leaves a stray
sleep behind for 30 s.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…NB-667)

Nothing here changes what the tray does:

- Tauri commands set_config and set_scan_key: registered, but the UI
  has saved settings through apply_settings since 8bf4c40 and never
  invokes them. The SetConfig / SetScanKey protocol requests stay
  (wire compatibility with separately installed daemons).
- lifecycle: decide/Action (used only by its own test), attach_or_spawn
  (no callers) and QuitAction/quit_action (an enum around one bool;
  perform_quit now tests the bool).
- show_settings_window / show_wallet_window were copies differing only
  in the tab: one show_window_tab(app, tab). The
  FRIGLET_TRAY_SHOW_ON_START parse is a pure function of the value, so
  its test no longer sets the process environment (the unsafe set_var's
  safety comment was false: tests run in parallel).
- get_config and send_with_note share one daemon_request helper
  (connect, request, map errors); the poller and the poll_once test
  helper share record_poll.
- ErrorBook::event returned "should be logged", which its only caller
  ignored; it returns nothing now. Doc links point at the constants
  that exist (STALL_GRACE_SECS, UNREACHABLE_GRACE_SECS).
- fake-daemon example: uses friglet_ipc's NETWORKS and one scan-key
  check instead of copies.
- UI: CSS rules already covered by `[hidden] { display: none
  !important; }`, a `.hint code` rule that matches nothing, and an
  unused id="recent-errors".
- tauri.conf.json: the bundle.linux.deb.depends block. The Tauri CLI
  adds libwebkit2gtk-4.1-0 and the appindicator package itself (with
  tauri's tray-icon feature on) and does not de-duplicate, so the .deb
  listed both packages twice.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- lib.rs tests: spawn_fake_daemon / spawn_fake_daemon_owned were a
  second fake next to spawn_stoppable_fake_daemon, differing only in
  canned GetStatus fields no test reads. Their four users never send
  Shutdown or check the pid, so they now use the one fake.
- lifecycle_e2e: attaches_when_daemon_already_running is covered by
  attach_carries_daemons_self_reported_ownership, which attaches the
  same way (the locator panics if consulted) and also checks the
  carried ownership.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@setavenger

Copy link
Copy Markdown
Owner Author

Merged into integration through #71 on 2026-10-11 (the user live-tested the combined stack first). GitHub's stacked-PR merge rebased the stack, so this PR's commits landed with new IDs and GitHub can't mark it merged itself. The code is identical: integration now has the same tree as the tested branch friglet-deslop-live-test (08bf11d), which contains this PR's head. Closing as merged via #71.

@setavenger setavenger closed this Oct 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant