Skip to content

Improve/check shutdown - #1899

Merged
PromoFaux merged 5 commits into
developmentfrom
improve/check_shutdown
Oct 3, 2025
Merged

Improve/check shutdown#1899
PromoFaux merged 5 commits into
developmentfrom
improve/check_shutdown

Conversation

@yubiuser

Copy link
Copy Markdown
Member

This PR improves the test_pihole_ftl_clean_shutdown function. Instead of shutting down the container from within and delay shutdown to grep for log lines, this PR shuts down the container from outside and uses docker log to search for the relevant FTL log line.
The second commit removes the $PYTEST variable: it was only used to delay the container shutdown during the tests and to skip creation of the default adlist. We can surely debate if we want to keep the variable anyways.

Comment thread test/tests/test_general.py
PromoFaux
PromoFaux previously approved these changes Sep 30, 2025
@PromoFaux

Copy link
Copy Markdown
Member

Ah, needs a little rebase

@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: yubiuser <github@yubiuser.dev>
Signed-off-by: yubiuser <github@yubiuser.dev>
…V systems

Signed-off-by: yubiuser <github@yubiuser.dev>
Signed-off-by: yubiuser <github@yubiuser.dev>
@github-actions

Copy link
Copy Markdown

Conflicts have been resolved.

@yubiuser

Copy link
Copy Markdown
Member Author

Rebased and forced push.

Signed-off-by: yubiuser <github@yubiuser.dev>
@yubiuser
yubiuser requested a review from PromoFaux September 30, 2025 19:13
@PromoFaux
PromoFaux merged commit 86a2776 into development Oct 3, 2025
11 checks passed
@PromoFaux
PromoFaux deleted the improve/check_shutdown branch October 3, 2025 12:07
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