Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docs/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -697,8 +697,9 @@ The running guard is tested against a ComfyUI answering on its port
(`starting`).

The e2e scenarios `comfyui-05` to `comfyui-13`
([comfyui.feature](../tests/e2e-cucumber/features/comfyui.feature), Linux, no
GPU) cover the same through the built binary: what is kept, replaced and left
([comfyui.feature](../tests/e2e-cucumber/features/comfyui.feature), no GPU;
only `comfyui-08`, `-11` and `-12` stay Linux-only, the rest also run on

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR description says the Strix Halo Windows e2e lane ran on this head and passed, but no such check is attached to this commit and the self-hosted run was still pending when I looked. Could you link the run? It is the only evidence that these six scenarios pass on Windows, which this line now asserts.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, and the description was wrong for this head — fixed now. The Windows pass it referenced was for the prior head (2822f21f), confirmed in the earlier automated review. My docs-only commit (5e222fb2) retriggered the self-hosted lane (it runs on every PR push, no path filter — see e2e-selfhosted.yml), but that run (https://github.com/ROCm/rocm-cli/actions/runs/40337515095) is still queued/pending, not yet passed for this commit. Leaving this open until it finishes; will report back here with the result.

Windows) cover the same through the built binary: what is kept, replaced and left
in place (also when the saved run state is unreadable), a failed download, the
dry run, a reinstall refused while ComfyUI runs (which the dry run says
first, and which is refused before anything is downloaded), `start` refusing a half-replaced folder until the command it names is
Expand Down
30 changes: 14 additions & 16 deletions tests/e2e-cucumber/features/comfyui.feature
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,19 @@ Feature: ComfyUI install reports progress and makes failures actionable
# aside, a failure after the new code is in place, and a download that is
# not a ComfyUI release. Each asserts what the CLI prints together with what
# is actually on disk afterwards. Only three of these still need the POSIX
# shell: comfyui-11's GPU-check failing transition plants a `#!/bin/sh`
# script (its passing-again half uses the Windows-portable `fake-python`
# stand-in, like every other scenario here), and comfyui-08/comfyui-12 each
# start their stand-in running ComfyUI process through `sh -c` (see
# `spawn_stand_in`). comfyui-05/-06/-07/-09/-10/-13 plant the same
# Windows-portable `fake-python` stand-in `comfyui-01`/`-02`/`-03` use and
# have no shell dependency of their own, but stay `@requires-os:linux` too:
# their reinstall behavior has not been run on Windows yet. Ungating them
# is tracked separately (#697), to keep this fix scoped to #629's
# comfyui-01/02/03 ask.
# shell and stay `@requires-os:linux`: comfyui-11's GPU-check failing
# transition plants a `#!/bin/sh` script (its passing-again half uses the
# Windows-portable `fake-python` stand-in, like every other scenario here),
# and comfyui-08/comfyui-12 each start their stand-in running ComfyUI
# process through `sh -c` (see `spawn_stand_in`). comfyui-05/-06/-07/-09/-10/-13
# plant the same Windows-portable `fake-python` stand-in `comfyui-01`/`-02`/`-03`
# use and have no shell dependency of their own, so they now run on both
# platforms too (#697).
#
# rocm-cli's saved record of a ComfyUI it started is unreadable here. `stop`
# cannot read it either, so it must not block the reinstall; the reinstall
# says it could not tell.
@id:comfyui-reinstall-keeps-user-data @requires-os:linux
@id:comfyui-reinstall-keeps-user-data
Scenario: comfyui-05 - Reinstalling ComfyUI replaces its code and keeps the user's own files
Given a ComfyUI install holding the user's models, workflows, images and custom nodes
And a newer ComfyUI release is available to download
Expand All @@ -138,15 +136,15 @@ Feature: ComfyUI install reports progress and makes failures actionable
And the reinstall lists the code it replaced
And the reinstall says it could not tell whether ComfyUI was running

@id:comfyui-reinstall-failed-download-changes-nothing @requires-os:linux
@id:comfyui-reinstall-failed-download-changes-nothing
Scenario: comfyui-06 - A ComfyUI reinstall whose download fails leaves the existing install untouched
Given a ComfyUI install holding the user's models, workflows, images and custom nodes
And the ComfyUI release download fails
When the user reinstalls ComfyUI
Then the reinstall fails
And the existing ComfyUI code and the user's files are untouched

@id:comfyui-reinstall-dry-run-names-kept-folders @requires-os:linux
@id:comfyui-reinstall-dry-run-names-kept-folders
Scenario: comfyui-07 - A ComfyUI reinstall dry run says what it replaces and keeps
Given a ComfyUI install holding the user's models, workflows, images and custom nodes
When the user previews reinstalling ComfyUI
Expand Down Expand Up @@ -192,7 +190,7 @@ Feature: ComfyUI install reports progress and makes failures actionable
# the CLI's own message) and proves the condition is cleared. `status` and
# the answer to a natural-language status question both name that command
# rather than `start` until then.
@id:comfyui-interrupted-reinstall-blocks-start @requires-os:linux
@id:comfyui-interrupted-reinstall-blocks-start
Scenario: comfyui-09 - ComfyUI will not start a half-replaced install until the reinstall is finished
Given a ComfyUI install holding the user's models, workflows, images and custom nodes
And a newer ComfyUI release is available to download
Expand All @@ -213,7 +211,7 @@ Feature: ComfyUI install reports progress and makes failures actionable
# of `source/`. The install recorded what its release shipped, so the
# reinstall knows that entry is the user's: it renames it and says where,
# instead of deleting it as old code.
@id:comfyui-reinstall-sets-aside-colliding-entry @requires-os:linux
@id:comfyui-reinstall-sets-aside-colliding-entry
Scenario: comfyui-10 - Reinstalling ComfyUI renames a folder of the user's that the new release also ships
Given a ComfyUI install holding the user's models, workflows, images and custom nodes
And the user keeps an app folder there that the installed ComfyUI release did not ship
Expand Down Expand Up @@ -264,7 +262,7 @@ Feature: ComfyUI install reports progress and makes failures actionable
# A download that unpacks but has no main.py is not installed: the reinstall
# would otherwise remove the installed code and put nothing startable in its
# place. It is not kept either, so the next attempt downloads again.
@id:comfyui-reinstall-rejects-download-without-main-py @requires-os:linux
@id:comfyui-reinstall-rejects-download-without-main-py
Scenario: comfyui-13 - A ComfyUI reinstall whose download is not a ComfyUI release leaves the install untouched
Given a ComfyUI install holding the user's models, workflows, images and custom nodes
And the newer ComfyUI release offered for download has no main.py
Expand Down
Loading