Skip to content

Commit 3bc9065

Browse files
committed
Make pytest.mark.django_db(reset_sequences=True) imply transaction=True again
Regressed in `4.5.0`. Though it would have been better if it hadn't, changing it now is a breaking change so needs to be fixed.
1 parent b97a8b1 commit 3bc9065

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

docs/changelog.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Changelog
22
=========
33

4+
v4.5.2 (2021-12-07)
5+
-------------------
6+
7+
Bugfixes
8+
^^^^^^^^
9+
10+
* Fix regression in v4.5.0 - ``pytest.mark.django_db(reset_sequence=True)`` now
11+
implies ``transaction=True`` again.
12+
13+
414
v4.5.1 (2021-12-02)
515
-------------------
616

pytest_django/fixtures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def _django_db_helper(
167167
serialized_rollback,
168168
) = False, False, None, False
169169

170-
transactional = transactional or (
170+
transactional = transactional or reset_sequences or (
171171
"transactional_db" in request.fixturenames
172172
or "live_server" in request.fixturenames
173173
)

tests/test_database.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,16 @@ def test_reset_sequences_disabled(self, request) -> None:
287287
marker = request.node.get_closest_marker("django_db")
288288
assert not marker.kwargs
289289

290-
@pytest.mark.django_db(transaction=True, reset_sequences=True)
290+
@pytest.mark.django_db(reset_sequences=True)
291291
def test_reset_sequences_enabled(self, request) -> None:
292292
marker = request.node.get_closest_marker("django_db")
293293
assert marker.kwargs["reset_sequences"]
294294

295+
@pytest.mark.django_db(transaction=True, reset_sequences=True)
296+
def test_transaction_reset_sequences_enabled(self, request) -> None:
297+
marker = request.node.get_closest_marker("django_db")
298+
assert marker.kwargs["reset_sequences"]
299+
295300
@pytest.mark.django_db(databases=['default', 'replica', 'second'])
296301
def test_databases(self, request) -> None:
297302
marker = request.node.get_closest_marker("django_db")

0 commit comments

Comments
 (0)