Make test_hist_file_config teardown deterministic

claude · Carreau · commit 4123ab58cccc · 2026-06-13T13:13:57.000+02:00
The test created a HistoryManager backed by a real file but never stopped its HistorySavingThread. The thread briefly holds a strong reference to the manager inside its polling loop, so the instance could survive the gc.collect() in the hmmax fixture teardown, making the instance-leak assertion fail intermittently. Stop the saving thread and close the database like the other tests in this file do, and drop the unreachable `HistoryManager.__max_inst` assignment that name-mangling never applied anyway. Fixes #15161 https://claude.ai/code/session_01AtmUVnQwZfjDBuUzF7TdGh
diff --git a/tests/test_history.py b/tests/test_history.py
@@ -263,18 +263,25 @@ def test_hist_file_config(hmmax3):
     cfg = Config()
     tfile = tempfile.NamedTemporaryFile(delete=False)
     cfg.HistoryManager.hist_file = Path(tfile.name)
+    hm = None
     try:
         hm = HistoryManager(shell=get_ipython(), config=cfg)
         assert hm.hist_file == cfg.HistoryManager.hist_file
     finally:
+        if hm is not None:
+            # Stop the saving thread and close the database, otherwise the
+            # thread can briefly hold a strong reference to the manager,
+            # making the instance-leak check in the fixture teardown flaky
+            # (gh-15161).
+            hm.save_thread.stop()
+            hm.db.close()
         try:
             Path(tfile.name).unlink()
         except OSError:
             # same catch as in testing.tools.TempFileMixin
             # On Windows, even though we close the file, we still can't
             # delete it.  I have no clue why
             pass
-            HistoryManager.__max_inst = 1
 
 
 def test_histmanager_memory_fallback_reopens_db(hmmax3, tmp_path, caplog):
