Stop one beat-import test reading the installed tzdata

pyproject.toml

@@ -56,7 +56,19 @@ Issues = "https://github.com/oxpull/django-ox/issues"
 
 [dependency-groups]
 dev = [
-    "pytest>=8.0",
+    # Ceiling: 9.2.0 changed monkeypatch.setattr's undo bookkeeping to read
+    # the pre-patch value from the target's own __dict__ (pytest #10644).
+    # Through a Django LazyObject proxy (django.contrib.admin.sites.site is
+    # one; django.db.connection is another), the delegated attribute is
+    # never in that __dict__, so monkeypatch records it as absent and
+    # deletes it from the wrapped object at teardown instead of restoring
+    # it. Harmless where a class method shows through once the instance
+    # shadow is gone (DatabaseWrapper._commit), but an attribute that exists
+    # only on the wrapped instance, such as AdminSite._actions, is then gone
+    # for every later test in the process. Upstream tracks it as
+    # pytest-dev/pytest#15099, open with no fix yet, so the ceiling is the
+    # whole 9.2 line rather than naming just 9.2.0.
+    "pytest>=8.0,<9.2",
     "pytest-django>=4.9",
     "pytest-cov>=6.0",
     "ruff>=0.14",

tests/test_dispatch_errors.py

@@ -413,10 +413,22 @@ def test_a_commit_that_fails_is_not_a_callback_failure(
         # the failure is that schedule's, and the pass goes on to the next.
         with_history()
         commit = connection._commit
+        fired = False
 
         def failing_commit():
-            monkeypatch.setattr(connection, "_commit", commit)
-            raise OperationalError("server closed the connection unexpectedly")
+            # Fires once, then calls the real commit directly for every
+            # later call in this test. Re-patching the attribute from here
+            # (rather than calling `commit` straight) left monkeypatch's own
+            # undo stack holding two entries for the same (connection,
+            # "_commit") pair; pytest 9.2's teardown unwinds that as a
+            # delattr on an attribute the second entry had already removed,
+            # raising AttributeError instead of restoring it. Never re-enter
+            # monkeypatch.setattr on the attribute it is already tracking.
+            nonlocal fired
+            if not fired:
+                fired = True
+                raise OperationalError("server closed the connection unexpectedly")
+            return commit()
 
         monkeypatch.setattr(connection, "_commit", failing_commit)
         with caplog.at_level(logging.INFO, logger="django_ox"):
@@ -438,7 +450,9 @@ def test_a_commit_that_loses_the_connection_ends_the_pass(
         commit = connection._commit
 
         def commit_on_a_dead_session():
-            monkeypatch.setattr(connection, "_commit", commit)
+            # Calls the real commit directly; see the note in
+            # test_a_commit_that_fails_is_not_a_callback_failure above about
+            # never re-entering monkeypatch.setattr on this same attribute.
             kill(connection)
             return commit()
 

tests/test_import_beat.py

@@ -963,10 +963,18 @@ def test_a_schedule_in_another_timezone_is_not_translated(beat_tables):
     assert "nightly" not in printed_rows(output)
 
 
-def test_an_equivalent_zone_under_another_name_is_still_translated(beat_tables):
-    # US/Eastern and America/New_York are one zone. Comparing the strings
+def test_an_equivalent_zone_under_another_name_is_still_translated(
+    beat_tables, zone_files
+):
+    # US/Eastern and America/New_York are one zone in the tz database: a
+    # link to the same rules under a legacy name. Comparing the strings
     # would divert a correctly-aligned schedule into the untranslated list.
-    # The one test here that leans on the tz database's own links.
+    # Built here under both names, so which releases of the system or
+    # packaged tzdata the link survives in is not this test's business;
+    # see test_two_names_for_the_same_zone_data_are_one_zone for the same
+    # mechanism under names the tz database has no opinion on at all.
+    zone_files("US/Eastern", PLUS_TWO)
+    zone_files("America/New_York", PLUS_TWO)
     set_crontab(1, timezone="US/Eastern")
     with override_settings(TIME_ZONE="America/New_York"):
         output = run()