Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix development tests #1645

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Fix development tests #1645

merged 1 commit into from
Sep 13, 2024

Conversation

PromoFaux
Copy link
Member

What does this PR aim to accomplish?:

Fixes currently failing tests, as seen here:
https://github.com/pi-hole/docker-pi-hole/actions/runs/10853053818/job/30121148521#step:5:525

Caused by this change in pi-hole/FTL#2057:
https://github.com/pi-hole/FTL/pull/2057/files#diff-e0cf5b28d9b6b600f0af2bc78e8fd30ec675fd731a5da86f0c4283ffc0e40176R142


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

  • I have read the above and my PR is ready for review. Check this box to confirm

@PromoFaux PromoFaux changed the title Clean Shutdown test: Remove check for the "Shutting down..." line in … Fix development tests Sep 13, 2024
DL6ER
DL6ER previously approved these changes Sep 13, 2024
Copy link
Member

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

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

Yeah, the jmpret was meant to be shown as debug output from the start, it was an oversight it stayed as INFO. The exit code is still shown in the ##### FTL terminated after ... (code 0 output

…FTL log as this is now only printed when debug logging is on

Signed-off-by: Adam Warner <[email protected]>
@PromoFaux PromoFaux merged commit 4c05862 into development Sep 13, 2024
6 checks passed
@PromoFaux PromoFaux deleted the fix-tests branch September 13, 2024 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants