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.

Sign up for GitHub

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

Jump to bottom

fix uwsgi_regexp_match() with pcre2 and corresponding unittest #2636

Merged
merged 4 commits into from
May 19, 2024
Merged

fix uwsgi_regexp_match() with pcre2 and corresponding unittest #2636

merged 4 commits into from
May 19, 2024

Conversation

niol
Copy link
Contributor

@niol niol commented Apr 29, 2024 •
edited by xrmx
Loading

Fixes #2634

xrmx
xrmx reviewed Apr 29, 2024
View reviewed changes
Copy link
Collaborator

@xrmx xrmx left a comment

Choose a reason for hiding this comment

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

The rename is a bit gratuitous but no big deal 😅 Thanks!

@niol
Copy link
Contributor Author

niol commented Apr 30, 2024

The rename is a bit gratuitous but no big deal 😅 Thanks!

Sorry for not having explained that. When tackling this, I was confused with the unit tests being in a unittest CI job, in a check directory, run in a tests target, unrelated to what is in the t and tests directories, and finally unrelated to uwsgiconfig.py --check, but needing a check dependency. So the rename is a shy try at bringing a bit more consistency in this.

@niol
make unittest a specific test job
5c6a3dc 
also rename unittests as such, making the distinction with tests and checks.
@niol niol force-pushed the testsuite branch 2 times, most recently from 175f50c to f51acb5 Compare May 2, 2024 09:58
@niol niol requested a review from xrmx May 7, 2024 10:40
xrmx
xrmx reviewed May 11, 2024
View reviewed changes
t/runner Outdated

class StaticTest(BaseTest.UwsgiServerTest):

ARGS = ['--plugin', 'python3', # provide a request plugin if no embedded request plugin
Copy link
Collaborator

Choose a reason for hiding this comment

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

'--plugin', 'python3' should not be required and loading the python plugin is failing because it's embeded

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It would be great of the integration test work with other build configurations, such as builds with no embedded plugins. That's the workaround I've found, otherwise uwsgi complains of no loaded request plugin. Do you have a better suggestion? Or this can be conditional.

xrmx
xrmx reviewed May 11, 2024
View reviewed changes
Copy link
Collaborator

@xrmx xrmx left a comment

Choose a reason for hiding this comment

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

Other than the small nit LGTM. If you have black or ruff at hand if you can run it over t/runner it would be nice

@xrmx xrmx merged commit 26ee7c0 into unbit:master May 19, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xrmx xrmx xrmx left review comments

Assignees
No one assigned
Labels
None yet
Projects
backports
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

UWSGI 2.0.25: static-expires-uri option does not work with libpcre2
2 participants
@niol @xrmx