Fix app creation in source.wsgi, add regression test #6742
Merged
Conversation
This file contains 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
|
Verified the source.py fix works in prod (and discovered #6743 along the way). Now figuring out why test_wsgi is passing locally and failing in CI and if we can also do a testinfra check too. |
In journalist.wsgi and source.wsgi, we import the relvant `app` variable so it can be executed by mod_wsgi. In bea3a0a this was accidentally refactored to be under the `if __name__ == "__main__"` block, so it wasn't available to be imported. To prevent this from recurring, add a documentation comment making it clear the variable needs to be globally accessible. A regression test mostly verifies that the wsgi files can be executed without errors. This required a slight modification to `source_app.create_app()` which tries to scan a directory that doesn't exist when tests are run. If the folder doesn't exist, we can skip that entire routine since there's no data to obscure. Fixes #6741.
|
staging failure is because hitting the smoke test against SI is giving a HTTP 500 Internal Server Error. :( |
The file needs to be readable by www-data, so the "world" spot should be set to 4 instead of 0.
Use curl on the host itself to verify that both the JI and SI reply with HTTP 200 OK and have "Powered by..." in the HTML. Notably this would've caught #6741.
zenmonkeykstop
approved these changes
Feb 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Status
Ready for review
Description of Changes
See individual commit messages for further detail.
Fixes #6741.
Testing
How should the reviewer test this PR?
make build-debs, install on a staging/prod environment, verify source interface works. Then run testinfra checks and verify they pass.Deployment
Any special considerations for deployment? No, this fixes regressions that were never released.
Checklist
make lint) and tests (make test) pass in the development container