[bot] Merge 26.7 to develop - #3170
Merged
Merged
Conversation
## Rationale `AdminConsoleTest.testEmailTimeoutSettings()` started failing intermittently in 26.8+, showing that the timeout settings were not always present. This test is passing regularly in 26.7. I believe a small MailHelper refactor in 26.8 caused a change in behavior; now, when email recording is on, the "test email" page shows the dumbster configuration (which lacks timeout properties) instead of the application.properties configuration (which includes them by default). This is likely the behavior we want in the "test email" page, so this changes the test to shut off email recording if it's on. And then restores it after verifying. The change is not technically needed for 26.7, but it doesn't hurt to disable/re-enable there. Also, "admin" is not a module, so remove that reference from `AbstractAdminConsoleTest.java`. ## Related Pull Requests - LabKey/platform#7848 - #3150
labkey-klum
approved these changes
Aug 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Generated automatically.
Merging changes from: 607206d
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_26.7