Fix a regression in assertQueries and update our dependency.

Review Request #14384 — Created March 20, 2025 and submitted — Latest diff uploaded

Information

Djblets
release-5.x

Reviewers

assertQueries() was updated to wrap django-assert-queries, but this
ended up being invoked incorrectly, causing the assertion to always
succeed. We were yielding the result and not entering its context.

This change updates the call to simply return the assert_queries()'s
context manager directly. This avoids the issue and avoids wrapping in
another layer of context managers.

We also now depend on django-assert-queries 2.0.1, which, along with the
above, has the added benefit of not including assertQueries() in the
stack trace.

Djblets unit tests pass.

Diff Revision 2 (Latest)

orig
1
2

Commits

First Last Summary ID Author
Fix a regression in assertQueries and update our dependency.
`assertQueries()` was updated to wrap `django-assert-queries`, but this ended up being invoked incorrectly, causing the assertion to always succeed. We were yielding the result and not entering its context. This change updates the call to simply return the `assert_queries()`'s context manager directly. This avoids the issue and avoids wrapping in another layer of context managers. We also now depend on django-assert-queries 2.0.1, which, along with the above, has the added benefit of not including `assertQueries()` in the stack trace.
82549b59fd7ca121bee936dc1cc25848e9a81e44 Christian Hammond
djblets/dependencies.py
djblets/testing/testcases.py
Loading...