Add integration tests to Makefile (and CI)

pyscript · ntoll · Sep 25, 2024 · Sep 10, 2024 · Sep 13, 2024 · Sep 17, 2024
commit 7da2ba6f6964b73c876cc50c7cba52bd8f8baa1b
diff --git a/Makefile b/Makefile
@@ -64,13 +64,7 @@ precommit-check:

 # Run all integration tests sequentially.
 test-integration:
-	mkdir -p test_results
-	pytest -vv $(ARGS) pyscript.core/tests/integration/ --log-cli-level=warning --junitxml=test_results/integration.xml
-
-# Run all integration tests in parallel.
-test-integration-parallel:
-	mkdir -p test_results
-	pytest --numprocesses auto -vv $(ARGS) pyscript.core/tests/integration/ --log-cli-level=warning --junitxml=test_results/integration.xml
+	cd pyscript.core && npm run test:integration

 # Format the code.
 fmt: fmt-py

diff --git a/pyscript.core/tests/integration.spec.js b/pyscript.core/tests/integration.spec.js
@@ -1,5 +1,45 @@
 import { test, expect } from '@playwright/test';

+test('Python unit tests - MicroPython on MAIN thread', async ({ page }) => {
+  await page.goto('http://localhost:8080/tests/integration/python/index.html');
+  test.setTimeout(120*1000);  // Increase timeout for this test.
+  const result = page.locator("#result");  // Payload for results will be here.
+  await result.waitFor();  // wait for the result.
+  const data = JSON.parse(await result.textContent());  // get the result data.
+  await expect(data.fails.length).toBe(0);  // ensure no test failed.
+  await result.waitFor()
+});
+
+test('Python unit tests - Pyodide on MAIN thread', async ({ page }) => {
+  await page.goto('http://localhost:8080/tests/integration/python/index.html?type=py');
+  test.setTimeout(120*1000);  // Increase timeout for this test.
+  const result = page.locator("#result");  // Payload for results will be here.
+  await result.waitFor();  // wait for the result.
+  const data = JSON.parse(await result.textContent());  // get the result data.
+  await expect(data.fails.length).toBe(0);  // ensure no test failed.
+  await result.waitFor()
+});
+
+test('Python unit tests - MicroPython on WORKER', async ({ page }) => {
+  await page.goto('http://localhost:8080/tests/integration/python/index.html?worker=1');
+  test.setTimeout(120*1000);  // Increase timeout for this test.
+  const result = page.locator("#result");  // Payload for results will be here.
+  await result.waitFor();  // wait for the result.
+  const data = JSON.parse(await result.textContent());  // get the result data.
+  await expect(data.fails.length).toBe(0);  // ensure no test failed.
+  await result.waitFor()
+});
+
+test('Python unit tests - Pyodide on WORKER', async ({ page }) => {
+  await page.goto('http://localhost:8080/tests/integration/python/index.html?type=py&worker=1');
+  test.setTimeout(120*1000);  // Increase timeout for this test.
+  const result = page.locator("#result");  // Payload for results will be here.
+  await result.waitFor();  // wait for the result.
+  const data = JSON.parse(await result.textContent());  // get the result data.
+  await expect(data.fails.length).toBe(0);  // ensure no test failed.
+  await result.waitFor()
+});
+
 test('MicroPython display', async ({ page }) => {
  await page.goto('http://localhost:8080/tests/js-integration/mpy.html');
  await page.waitForSelector('html.done.worker');
@@ -94,6 +134,7 @@ test('MicroPython + JS Storage', async ({ page }) => {
 });

 test('MicroPython + workers', async ({ page }) => {
+  test.setTimeout(120*1000);  // Increase timeout for this test.
  await page.goto('http://localhost:8080/tests/js-integration/workers/index.html');
  await page.waitForSelector('html.mpy.py');
 });

diff --git a/pyscript.core/tests/integration/python/tests/test_running_in_worker.py b/pyscript.core/tests/integration/python/tests/test_running_in_worker.py
@@ -5,7 +5,7 @@
 import upytest
 from pyscript import RUNNING_IN_WORKER, document

-# In the test suite, runnint in a worker is flagged by the presence of the
+# In the test suite, running in a worker is flagged by the presence of the
 # "worker" query string. We do this to avoid using RUNNING_IN_WORKER to skip
 # tests that check RUNNING_IN_WORKER.
 in_worker = "worker" in document.location.search.lower()