Fix tests for new modular packaging

test/conftest.py

@@ -3,6 +3,7 @@ Various common utilities for testing.
 """
 
 import pathlib
+import time
 
 try:
     import pytest
@@ -16,10 +17,19 @@ BUILD_PATH = TEST_PATH / '..' / 'build'
 
 class PyodideInited:
     def __call__(self, driver):
-        inited = driver.execute_script("return window.pyodide && window.pyodide.runPython")
+        inited = driver.execute_script(
+            "return window.pyodide && window.pyodide.runPython")
         return inited is not None
 
 
+class PackageLoaded:
+    def __call__(self, driver):
+        print("PackageLoaded")
+        inited = driver.execute_script(
+            "return window.done")
+        return bool(inited)
+
+
 class SeleniumWrapper:
     def __init__(self):
         from selenium.webdriver import Firefox
@@ -32,7 +42,7 @@ class SeleniumWrapper:
         wait = WebDriverWait(driver, timeout=20)
         driver.get((BUILD_PATH / "test.html").as_uri())
         wait.until(PyodideInited())
-
+        self.wait = wait
         self.driver = driver
 
     @property
@@ -40,9 +50,19 @@ class SeleniumWrapper:
         return self.driver.execute_script("return window.logs")
 
     def run(self, code):
-        return self.driver.execute_script(
+        return self.run_js(
             'return pyodide.runPython({!r})'.format(code))
 
+    def run_js(self, code):
+        return self.driver.execute_script(code)
+
+    def load_package(self, packages):
+        self.run_js(
+            'window.done = false\n'
+            'pyodide.loadPackage({!r}).then(window.done = true)'.format(packages))
+        time.sleep(2)
+        self.wait.until(PackageLoaded())
+
     @property
     def urls(self):
         for handle in self.driver.window_handles:
@@ -56,5 +76,7 @@ if pytest is not None:
         selenium = SeleniumWrapper()
         try:
             yield selenium
+        except:
+            print(selenium.logs)
         finally:
             selenium.driver.quit()

test/test_numpy.py

 def test_numpy(selenium):
+    selenium.load_package("numpy")
     selenium.run("import numpy")
     x = selenium.run("numpy.zeros((32, 64))")
     assert len(x) == 32

test/test_pandas.py

 def test_pandas(selenium):
-    selenium.run("import pandas")
+    selenium.load_package("pandas")
+    assert len(selenium.run("import pandas\ndir(pandas)")) == 6
 
 
 def test_extra_import(selenium):

test/test_python.py

@@ -45,8 +45,6 @@ def test_run_core_python_test(python_test, selenium):
         "from test.libregrtest import main\n"
         "main(['{}'], verbose=True, verbose3=True)".format(python_test))
     exitcode = selenium.run("exitcode")
-    if exitcode != 0:
-        print('\n'.join(selenium.logs))
     assert exitcode == 0