Merge pull request #158 from kraken-tech/meshy/refactor-after-commit-runner

Extract settings into named variables for readability

Author: meshy

src/django_subatomic/db.py

@@ -252,26 +252,28 @@ def _execute_on_commit_callbacks_in_tests(using: str | None = None) -> Generator
         https://github.com/django/django/blob/stable/4.2.x/django/db/backends/base/base.py#L762-L779
     """
     only_in_testcase_transaction = _innermost_atomic_block_wraps_testcase(using=using)
+    if not only_in_testcase_transaction:
+        yield
+        return
 
-    if (
-        getattr(
-            settings, "SUBATOMIC_CATCH_UNHANDLED_AFTER_COMMIT_CALLBACKS_IN_TESTS", True
-        )
-        and only_in_testcase_transaction
-    ):
-        connection = django_transaction.get_connection(using)
+    raise_unhandled_callbacks = getattr(
+        settings, "SUBATOMIC_CATCH_UNHANDLED_AFTER_COMMIT_CALLBACKS_IN_TESTS", True
+    )
+    # See Note [Running after-commit callbacks in tests]
+    run_callbacks = getattr(
+        settings, "SUBATOMIC_RUN_AFTER_COMMIT_CALLBACKS_IN_TESTS", True
+    )
+
+    connection = django_transaction.get_connection(using)
+
+    if raise_unhandled_callbacks:
         callbacks = connection.run_on_commit
         if callbacks:
             raise _UnhandledCallbacks(tuple(callback for _, callback, _ in callbacks))
 
     yield
 
-    if (
-        # See Note [Running after-commit callbacks in tests]
-        getattr(settings, "SUBATOMIC_RUN_AFTER_COMMIT_CALLBACKS_IN_TESTS", True)
-        and only_in_testcase_transaction
-    ):
-        connection = django_transaction.get_connection(using)
+    if run_callbacks:
         callbacks = connection.run_on_commit
         connection.run_on_commit = []
         for _, callback, robust in callbacks:

src/django_subatomic/test.py

@@ -49,9 +49,11 @@ def part_of_a_transaction(using: str | None = None) -> Generator[None]:
     use [`transaction`][django_subatomic.db.transaction] instead.
     """
     connection = transaction.get_connection(using)
-    if getattr(
+    raise_unhandled_callbacks = getattr(
         settings, "SUBATOMIC_CATCH_UNHANDLED_AFTER_COMMIT_CALLBACKS_IN_TESTS", True
-    ):
+    )
+
+    if raise_unhandled_callbacks:
         callbacks = connection.run_on_commit
         if callbacks:
             raise _UnhandledCallbacks(tuple(callback for _, callback, _ in callbacks))