fix 2 more leaks

Author: Carreau

tests/conftest.py

@@ -21,6 +21,9 @@
 
 # ensure we don't leak history managers
 if os.name != "nt":
+    import tracemalloc
+
+    tracemalloc.start(20)
     HistoryManager._max_inst = 1
 
 

tests/test_zmq_shell.py

@@ -211,46 +211,56 @@ def test_unregister_hook(self):
 
 
 def test_magics(tmp_path):
-    context = zmq.Context()
-    socket = context.socket(zmq.PUB)
-    shell = InteractiveShell()
-    shell.user_ns["hi"] = 1
-    magics = KernelMagics(shell)
-
-    tmp_file = tmp_path / "test.txt"
-    tmp_file.write_text("hi", "utf8")
-    magics.edit(str(tmp_file))
-    payload = shell.payload_manager.read_payload()[0]
-    assert payload["filename"] == str(tmp_file)
-
-    magics.clear([])
-    magics.less(str(tmp_file))
-    if os.name == "posix":
-        magics.man("ls")
-    magics.autosave("10")
-
-    socket.close()
-    context.destroy()
+    try:
+        context = zmq.Context()
+        socket = context.socket(zmq.PUB)
+        shell = InteractiveShell()
+        shell.user_ns["hi"] = 1
+        magics = KernelMagics(shell)
+
+        tmp_file = tmp_path / "test.txt"
+        tmp_file.write_text("hi", "utf8")
+        magics.edit(str(tmp_file))
+        payload = shell.payload_manager.read_payload()[0]
+        assert payload["filename"] == str(tmp_file)
+
+        magics.clear([])
+        magics.less(str(tmp_file))
+        if os.name == "posix":
+            magics.man("ls")
+        magics.autosave("10")
+
+        socket.close()
+        context.destroy()
+    finally:
+        shell.history_manager = None
+        shell.configurables = []
+        InteractiveShell.clear_instance()
 
 
 def test_zmq_interactive_shell(kernel):
-    shell = ZMQInteractiveShell()
-
-    with pytest.raises(RuntimeError):
-        shell.enable_gui("tk")
-
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", DeprecationWarning)
-        shell.data_pub_class = MagicMock()  # type:ignore
-        shell.data_pub
-    shell.kernel = kernel
-    shell.set_next_input("hi")
-    assert shell.get_parent() is None
-    if os.name == "posix":
-        shell.system_piped("ls")
-    else:
-        shell.system_piped("dir")
-    shell.ask_exit()
+    try:
+        shell = ZMQInteractiveShell()
+
+        with pytest.raises(RuntimeError):
+            shell.enable_gui("tk")
+
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            shell.data_pub_class = MagicMock()  # type:ignore
+            shell.data_pub
+        shell.kernel = kernel
+        shell.set_next_input("hi")
+        assert shell.get_parent() is None
+        if os.name == "posix":
+            shell.system_piped("ls")
+        else:
+            shell.system_piped("dir")
+        shell.ask_exit()
+    finally:
+        shell.history_manager = None
+        shell.configurables = []
+        ZMQInteractiveShell.clear_instance()
 
 
 if __name__ == "__main__":