From 879b33e3cd3d33410dad88d0e4e350cbfb85a5d5 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Tue, 23 Jan 2024 18:39:03 -0800 Subject: [PATCH] fix tests --- conftest.py | 10 +++++----- src/tests/test_pyodide.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conftest.py b/conftest.py index 136a0bbc85a..384f685133b 100644 --- a/conftest.py +++ b/conftest.py @@ -35,18 +35,18 @@ # We need to go through and touch them all once to keep everything okay. pytest_pyodide.runner.INITIALIZE_SCRIPT = """ pyodide.globals.get; + pyodide.runPython("import pyodide_js._api; del pyodide_js"); + pyodide._api.importlib.invalidate_caches; + pyodide._api.package_loader.unpack_buffer; + pyodide._api.package_loader.get_dynlibs; pyodide._api.pyodide_code.eval_code; pyodide._api.pyodide_code.eval_code_async; pyodide._api.pyodide_code.find_imports; pyodide._api.pyodide_ffi.register_js_module; pyodide._api.pyodide_ffi.unregister_js_module; - pyodide._api.importlib.invalidate_caches; - pyodide._api.package_loader.unpack_buffer; - pyodide._api.package_loader.get_dynlibs; - pyodide.runPython(""); pyodide.pyimport("pyodide.ffi.wrappers").destroy(); pyodide.pyimport("pyodide.http").destroy(); - pyodide.pyimport("pyodide_js._api") + pyodide.pyimport("pyodide_js._api"); """ only_node = pytest.mark.xfail_browsers( diff --git a/src/tests/test_pyodide.py b/src/tests/test_pyodide.py index 7a8a7036ea0..e34597bf7d3 100644 --- a/src/tests/test_pyodide.py +++ b/src/tests/test_pyodide.py @@ -1163,7 +1163,7 @@ def normalize_tb(t): ["", "c1"], ["test.html", "b"], ["pyodide.asm.js", "pyimport"], - ["importlib/__init__.py", "import_module"], + ["_pyodide/_base.py", "pyimport_impl"], ] assert normalize_tb(res[: len(frames)]) == frames