Skip to content

tests: fix four source checks broken on main (PREPARE fixture; ini_key renames; long-path out-of-space folder; DrawParameters Ctx) - #1793

Merged
NotRexed merged 9 commits into
mainfrom
fix/main-tests-prepare-ini-keys
Nov 10, 2026
Merged

NotRexed merged 9 commits into
mainfrom
fix/main-tests-prepare-ini-keys

Conversation

@NotRexed

Copy link
Copy Markdown
Owner

Main's Python source checks fail on two tests since today's merges. Every open PR's run shows it, #1625 included:

  • test_lift_cleanup_error: it runs make_game.py's say/fail in its own namespace. say() now reads the global PREPARE (feat: RecompLauncher support (recomplauncher.json, make_game --game/--prepare) #1102's --prepare), which raises NameError: name 'PREPARE' is not defined. The fixture now defines PREPARE=False, its value at the start.
  • test_recomplauncher_json: it only allowed output_res as a row whose saved key isn't its name. ini_key also saves resolution (Render resolution), upscaling (Upscaler) and dlss, and the manifest uses resolution and upscaling. The test now reads those renames from ini_key itself.

Tests only, no product change. Both pass locally on main d71739d.

🤖 Generated with Claude Code

…eys read ini_key's own renames

Main's Python source checks failed on both since today's merges:
- test_lift_cleanup_error runs make_game.py's say()/fail() in its own namespace,
  and say() now reads PREPARE (#1102's --prepare): NameError. The fixture gives
  it PREPARE=False, its value at the start.
- test_recomplauncher_json allowed only output_res as a row whose saved key is
  not its name; ini_key also saves resolution, upscaling and dlss, and the
  manifest uses the first two. The test now reads those renames from ini_key.

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

Copy link
Copy Markdown
Contributor

Verified 172d56c in a clean detached worktree on Windows 11 / Python 3.14.7:

  • python -I -B tests/test_lift_cleanup_error.py: 8 passed.
  • python -I -B tests/test_recomplauncher_json.py: 3 passed.

These address the same PREPARE and saved-key failures in the source checks on our rebased PRs. The upscaling key is valid: ini_key preserves it when the menu row is renamed. No product behavior change or full-suite result is claimed by this focused check.

@Arkex-ai

Arkex-ai commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

One additional Windows baseline failure on main 2ea6386: nx2/test_nup_out_of_space.py compares the mocked shutil.disk_usage(path) call's path literally. After #1497, the actual path has the Windows extended-length \\?\ prefix while the expected path does not. This is separate from this PR's two fixes; the existing main/candidate runs reproduce it equally. The fixture should preserve the identity of the directory being measured, the single call and the check that the partial file still exists at measurement time, as well as its later cleanup assertions.

Correction to my original note: this records disk_usage, not rmtree; I rechecked the usage spy in the source.

I am leaving that fix with the current main/CI owners to avoid a duplicate. My masked-clear candidate adds no failure relative to that baseline (267 passed/5 failed/20 skipped versus266/5/20 on Windows).

@NotRexed NotRexed changed the title tests: fix two source checks broken on main (PREPARE in the lift cleanup fixture; ini_key renames) tests: fix three source checks broken on main (PREPARE fixture; ini_key renames; long-path out-of-space folder) Nov 10, 2026
…path (#1497 extracts through \?\ paths)

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

Copy link
Copy Markdown
Contributor

Tested both commits from this PR on main ae082989 (which now contains #1819), using validation-only head 4d13196f30de180da327b0d3eb63b44134ae80a1.

Combined source CI: Windows source checks, native F2I lowering, SPIR-V lowering and actionlint passed. Ubuntu finished with 289 passed, 1 failed, 9 skipped. The three fixtures fixed here and both renderer fixtures pass.

The remaining Ubuntu failure is nx2/test_draw_parameters.py: its extracted production capability block now reads ctx.mesh_fallback, but the modeled Ctx only provides wants_mesh_first. Compiler error: no member named 'mesh_fallback' in 'Ctx'. This is a separate fixture dependency; no production failure or all-green result claimed. Sharing the exact integration result rather than opening overlapping CI work.

@NotRexed NotRexed changed the title tests: fix three source checks broken on main (PREPARE fixture; ini_key renames; long-path out-of-space folder) tests: fix four source checks broken on main (PREPARE fixture; ini_key renames; long-path out-of-space folder; DrawParameters Ctx) Nov 10, 2026
NotRexed and others added 2 commits November 10, 2026 12:51
…reads it since the mesh fallback skips a task's DrawIndex)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…e-ini-keys

# Conflicts:
#	tests/test_lift_cleanup_error.py
#	tests/test_recomplauncher_json.py
@Arkex-ai

Copy link
Copy Markdown
Contributor

One new main CI fixture issue after #1839: on exact main 692e87df, test_wayland_libdecor_hint.py fails with Windows LLVM-Mingw:

error: use of undeclared identifier 'setenv'
error: variable 'sdl_ready' set but not used [-Werror,-Wunused-but-set-global]

Complete local main suite:290 passed/4 failed/20 skipped; the other three failures are the already recorded NUP path/disk-usage and local SDK limitations. The same four occur on our candidate, so this is baseline scope. Sharing with the existing CI-repair thread rather than mixing it into a renderer feature. No warning/assertion suppression proposed.

NotRexed and others added 3 commits November 10, 2026 14:03
…s harness), skipped on Windows

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…mage's end since present ahead

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

Copy link
Copy Markdown
Owner Author

Updated onto main (19:00Z, after #1858). Main has since fixed test_lift_cleanup_error and test_recomplauncher_json on its own, so those are taken as main has them. This PR now fixes the four tests still failing on main:

@NotRexed
NotRexed merged commit 117eae7 into main Nov 10, 2026
10 checks passed
@NotRexed
NotRexed deleted the fix/main-tests-prepare-ini-keys branch November 10, 2026 19:22
klimovich008 added a commit to klimovich008/Hookshot that referenced this pull request Nov 10, 2026
nx2/test_draw_parameters.py: main's own fix (NotRexed#1793) replaces this branch's one-line fixture fix.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.

2 participants