Skip to content

tests: Use "no plan" style of TAP output - #778

Merged
bbhtt merged 1 commit into
flatpak:mainfrom
smcv:tests-clarity
Sep 15, 2026
Merged

bbhtt merged 1 commit into
flatpak:mainfrom
smcv:tests-clarity

Conversation

@smcv

@smcv smcv commented Sep 14, 2026 •

Copy link
Copy Markdown
Contributor

Comment thread tests/test-sandboxed-mode-source-resolution.sh
@bbhtt

bbhtt commented Sep 15, 2026 •

Copy link
Copy Markdown
Collaborator

LGTM minus the JXL change in appstream as I said in the other thread.

If you want this merged first, you can drop the JXL change.

I'll have to do some changes to the code to make sure it stays PNG and release a new version.

@smcv smcv changed the title Improve test suite output tests: Use "no plan" style of TAP output Sep 15, 2026
@smcv

smcv commented Sep 15, 2026

Copy link
Copy Markdown
Contributor Author

I moved the most important part of this for diagnosing #776 into #781.

Because the number of tests in test-builder.sh has changed between flatpak-builder-1.4.x and main, it's not going to be useful to rebase tests: Use "no plan" style of TAP output onto main until the two branches have been reconciled.

@smcv
smcv marked this pull request as draft September 15, 2026 10:42
@bbhtt

bbhtt commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator

Are you going to rebase this? or should I take over? It's the last thing before the 1.4.12 release.

@smcv
smcv marked this pull request as ready for review September 15, 2026 10:53
@smcv

smcv commented Sep 15, 2026

Copy link
Copy Markdown
Contributor Author

This will need a rebase after #782 lands, but is otherwise ready (only look at the last commit).

This also doesn't have to be a release blocker, skipping it until after 1.4.12 is completely fine.

I've targeted main only here: I don't know whether you'll want it in 1.4.x or not. If cherry-picked to 1.4.x, there will be some conflicts in places where main has added additional test coverage (just test-builder.sh, I think).

Similar to
flatpak/flatpak@b1fdf6c
this makes it more obvious where the boundary between test-cases is,
and similar to flatpak/flatpak#6794 it avoids
needing to declare up-front how many tests we plan to run (which makes
conflicts inevitable if we add more than one test to the same script).

Signed-off-by: Simon McVittie <smcv@debian.org>
@smcv

smcv commented Sep 15, 2026

Copy link
Copy Markdown
Contributor Author

eaa42a1: rebased after #782 landed, no functional change.

@bbhtt

bbhtt commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator

Yep I am backporting it to 1.4.x

@bbhtt
bbhtt merged commit c2d9ea9 into flatpak:main Sep 15, 2026
2 checks passed
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