Merge pull request #5874 from takluyver/test-hist-close-db

Ensure history database is closed in test

IPython/core/history.py

@@ -775,6 +775,7 b' class HistorySavingThread(threading.Thread):'
             while True:
                 self.history_manager.save_flag.wait()
                 if self.stop_now:
+                    self.db.close()
                     return
                 self.history_manager.save_flag.clear()
                 self.history_manager.writeout_cache(self.db)

IPython/core/tests/test_history.py

@@ -136,6 +136,8 b' def test_history():'
         finally:
             # Ensure saving thread is shut down before we try to clean up the files
             ip.history_manager.save_thread.stop()
+            # Forcibly close database rather than relying on garbage collection
+            ip.history_manager.db.close()
             # Restore history manager
             ip.history_manager = hist_manager_ori