Improve WASM testing and CI

Author: coolreader18

wasm/demo/src/index.js

@@ -148,4 +148,9 @@ function onReady() {
     terminalVM = rp.vmStore.init('term_vm');
     terminalVM.setStdout(data => localEcho.println(data));
     readPrompts().catch(err => console.error(err));
+
+    // so that the test knows that we're ready
+    const readyElement = document.createElement('div');
+    readyElement.id = 'rp_loaded';
+    document.head.appendChild(readyElement);
 }

wasm/tests/.travis-runner.sh

@@ -20,4 +20,4 @@ export PATH=$PATH:$PWD/geckodriver
 pip install pipenv
 (cd wasm/tests; pipenv install)
 
-(cd wasm/demo; npm install; npm run build; npm run ci)
+(cd wasm/demo; npm install; npm run test)

wasm/tests/conftest.py

@@ -0,0 +1,107 @@
+import subprocess
+import os
+import time
+import socket
+import atexit
+import pytest
+
+PORT = 8080
+
+HTTP_SCRIPT = f"""
+import mimetypes
+mimetypes.add_type("application/wasm", ".wasm")
+import http.server
+http.server.test(HandlerClass=http.server.SimpleHTTPRequestHandler, port={PORT})
+"""
+
+demo_dist = os.path.join(os.path.dirname(os.path.realpath(__file__)), "../demo/dist/")
+
+server_proc = None
+
+
+def pytest_sessionstart(session):
+    global server_proc
+    server_proc = subprocess.Popen(
+        ["python3", "-c", HTTP_SCRIPT],
+        cwd=demo_dist,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+    wait_for_port(PORT)
+
+
+def pytest_sessionfinish(session):
+    global server_proc
+    server_proc.terminate()
+    server_proc = None
+
+
+atexit.register(lambda: server_proc and server_proc.terminate())
+
+
+# From https://gist.github.com/butla/2d9a4c0f35ea47b7452156c96a4e7b12
+def wait_for_port(port, host="0.0.0.0", timeout=5.0):
+    """Wait until a port starts accepting TCP connections.
+    Args:
+        port (int): Port number.
+        host (str): Host address on which the port should exist.
+        timeout (float): In seconds. How long to wait before raising errors.
+    Raises:
+        TimeoutError: The port isn't accepting connection after time specified in `timeout`.
+    """
+    start_time = time.perf_counter()
+    while True:
+        try:
+            with socket.create_connection((host, port), timeout=timeout):
+                break
+        except OSError as ex:
+            time.sleep(0.01)
+            if time.perf_counter() - start_time >= timeout:
+                raise TimeoutError(
+                    "Waited too long for the port {} on host {} to start accepting "
+                    "connections.".format(port, host)
+                ) from ex
+
+
+from selenium import webdriver
+from selenium.webdriver.firefox.options import Options
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.common.exceptions import JavascriptException
+
+
+class Driver(webdriver.Firefox):
+    def _print_panic(self):
+        stack = driver.execute_script(
+            "return (window.__RUSTPYTHON_ERROR_MSG || '') + '\\n' + (window.__RUSTPYTHON_ERROR_STACK || '')"
+        )
+        if stack.strip():
+            print(f"RustPython panic stack:\n{stack}", file=sys.stderr)
+
+    def execute_script(self, *args, **kwargs):
+        try:
+            return super().execute_script(*args, **kwargs)
+        except JavascriptException:
+            self._print_panic()
+            raise
+
+
+@pytest.fixture
+def wdriver(request):
+    options = Options()
+    options.add_argument("-headless")
+    driver = Driver(options=options)
+    try:
+        driver.get(f"http://0.0.0.0:{PORT}")
+        WebDriverWait(driver, 5).until(
+            EC.presence_of_element_located((By.ID, "rp_loaded"))
+        )
+    except JavascriptException:
+        driver._print_panic()
+        driver.quit()
+        raise
+
+    yield driver
+
+    driver.quit()

wasm/tests/test_demo.py

@@ -17,39 +17,11 @@
 return output;
 """
 
-def print_stack(driver):
-	stack = driver.execute_script(
-		"return window.__RUSTPYTHON_ERROR_MSG + '\\n' + window.__RUSTPYTHON_ERROR_STACK"
-	)
-	print(f"RustPython error stack:\n{stack}", file=sys.stderr)
 
-
-@pytest.fixture(scope="module")
-def driver(request):
-	options = Options()
-	options.add_argument('-headless')
-	driver = webdriver.Firefox(options=options)
-	try:
-		driver.get("http://localhost:8080")
-	except Exception as e:
-		print_stack(driver)
-		raise
-	time.sleep(5)
-	yield driver
-	driver.close()
-
-
-@pytest.mark.parametrize("script, output",
-	[
-		("print(5)", "5"),
-		("a=5;b=4;print(a+b)", "9")
-	]
+@pytest.mark.parametrize(
+    "script, output", [("print(5)", "5"), ("a=5;b=4;print(a+b)", "9")]
 )
-def test_demo(driver, script, output):
-	script = RUN_CODE_TEMPLATE.format(script)
-	try:
-		script_output = driver.execute_script(script)
-	except Exception as e:
-		print_stack(driver)
-		raise
-	assert script_output.strip() == output
+def test_demo(wdriver, script, output):
+    script = RUN_CODE_TEMPLATE.format(script)
+    script_output = wdriver.execute_script(script)
+    assert script_output.strip() == output

wasm/tests/test_exec_mode.py

@@ -1,46 +1,18 @@
-import time
-import sys
+def test_eval_mode(wdriver):
+    assert wdriver.execute_script("return window.rp.pyEval('1+1')") == 2
 
-from selenium import webdriver
-from selenium.webdriver.firefox.options import Options
-import pytest
+def test_exec_mode(wdriver):
+    assert wdriver.execute_script("return window.rp.pyExec('1+1')") is None
 
-def print_stack(driver):
-    stack = driver.execute_script(
-        "return window.__RUSTPYTHON_ERROR_MSG + '\\n' + window.__RUSTPYTHON_ERROR_STACK"
-    )
-    print(f"RustPython error stack:\n{stack}", file=sys.stderr)
-
-
-@pytest.fixture(scope="module")
-def driver(request):
-    options = Options()
-    options.add_argument('-headless')
-    driver = webdriver.Firefox(options=options)
-    try:
-        driver.get("http://localhost:8080")
-    except Exception as e:
-        print_stack(driver)
-        raise
-    time.sleep(5)
-    yield driver
-    driver.close()
-
-
-def test_eval_mode(driver):
-    assert driver.execute_script("return window.rp.pyEval('1+1')") == 2
-
-def test_exec_mode(driver):
-    assert driver.execute_script("return window.rp.pyExec('1+1')") is None
-
-def test_exec_single_mode(driver):
-    assert driver.execute_script("return window.rp.pyExecSingle('1+1')") == 2
-    assert driver.execute_script(
+def test_exec_single_mode(wdriver):
+    assert wdriver.execute_script("return window.rp.pyExecSingle('1+1')") == 2
+    assert wdriver.execute_script(
         """
         var output = [];
         save_output = function(text) {{
-            output.push(text)
+           output.push(text)
         }};
         window.rp.pyExecSingle('1+1\\n2+2',{stdout: save_output});
         return output;
-        """) == ['2\n', '4\n']
+        """
+    ) == ["2\n", "4\n"]