jprdonnelly/pyscript
1
0
Fork 0
mirror of https://github.com/pyscript/pyscript.git synced 2025-12-19 10:17:23 -05:00
Code Issues Projects Releases Wiki Activity

Add media module tests (#2306)

Browse Source 
* Add media Python tests

* Add media js test

* Remove try except blocks

* Make Python tests more end-to-end

* Add media Python tests

* Add media js test

* Remove try except blocks

* Make Python tests more end-to-end

* MicroPython explorations.

* Fix websocket tests, so they just skip.

* Fix MicroPython media tests, if no permission is given for a video device.

---------

Co-authored-by: Nicholas H.Tollervey <ntoll@ntoll.org>
Co-authored-by: Andrea Giammarchi <andrea.giammarchi@gmail.com>
This commit is contained in:
Dan Yeaw
2025-03-20 09:35:01 -04:00
committed by GitHub
parent 46ca9154c4
commit b911ea99fb
8 changed files with 162 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/stdlib/pyscript.js
View File

File diff suppressed because one or more lines are too long

21
core/src/stdlib/pyscript/media.py
View File

@@ -31,25 +31,22 @@ class Device:
@classmethod
async def load(cls, audio=False, video=True):
"""Load the device stream."""
options = window.Object.new()
options.audio = audio
"""
Load the device stream.
"""
options = {}
options["audio"] = audio
if isinstance(video, bool):
options.video = video
options["video"] = video
else:
# TODO: Think this can be simplified but need to check it on the pyodide side
# TODO: this is pyodide specific. shouldn't be!
options.video = window.Object.new()
options["video"] = {}
for k in video:
setattr(options.video, k, to_js(video[k]))
return await window.navigator.mediaDevices.getUserMedia(options)
options["video"][k] = video[k]
return await window.navigator.mediaDevices.getUserMedia(to_js(options))
async def get_stream(self):
key = self.kind.replace("input", "").replace("output", "")
options = {key: {"deviceId": {"exact": self.id}}}
return await self.load(**options)

39
core/tests/javascript/media.html Normal file
View File

@@ -0,0 +1,39 @@
<!DOCTYPE html>
<html>
<head>
<title>Pyodide Media Module Test</title>
<link rel="stylesheet" href="../../dist/core.css">
<script type="module" src="../../dist/core.js"></script>
</head>
<body>
<h1>Pyodide Media Module Test</h1>
<div id="test-results">Running tests...</div>
<script type="py" terminal>
from pyscript import window, document
from pyscript import media
async def run_tests():
# Test basic module structure
assert hasattr(media, "Device"), "media module should have Device class"
assert hasattr(media, "list_devices"), "media module should have list_devices function"
# Test device enumeration
devices = await media.list_devices()
assert isinstance(devices, list), "list_devices should return a list"
# If we have devices, test properties of one
if devices:
device = devices[0]
assert hasattr(device, "id"), "Device should have id property"
assert hasattr(device, "group"), "Device should have group property"
assert hasattr(device, "kind"), "Device should have kind property"
assert hasattr(device, "label"), "Device should have label property"
document.getElementById('test-results').innerText = "Success!"
document.documentElement.classList.add('media-ok')
await run_tests()
</script>
</body>
</html>

21
core/tests/js_tests.spec.js
View File

@@ -171,3 +171,24 @@ test('MicroPython buffered NO error', async ({ page }) => {
const body = await page.evaluate(() => document.body.textContent.trim());
await expect(body).toBe('');
});
test('Pyodide media module', async ({ page }) => {
await page.context().grantPermissions(['camera', 'microphone']);
await page.context().addInitScript(() => {
const originalEnumerateDevices = navigator.mediaDevices.enumerateDevices;
navigator.mediaDevices.enumerateDevices = async function() {
const realDevices = await originalEnumerateDevices.call(this);
if (!realDevices || realDevices.length === 0) {
return [
{ deviceId: 'camera1', groupId: 'group1', kind: 'videoinput', label: 'Simulated Camera' },
{ deviceId: 'mic1', groupId: 'group2', kind: 'audioinput', label: 'Simulated Microphone' }
];
}
return realDevices;
};
});
await page.goto('http://localhost:8080/tests/javascript/media.html');
await page.waitForSelector('html.media-ok', { timeout: 10000 });
const isSuccess = await page.evaluate(() => document.documentElement.classList.contains('media-ok'));
expect(isSuccess).toBe(true);
});

1
core/tests/python/settings_mpy.json
View File

@@ -8,6 +8,7 @@
"./tests/test_fetch.py": "tests/test_fetch.py",
"./tests/test_ffi.py": "tests/test_ffi.py",
"./tests/test_js_modules.py": "tests/test_js_modules.py",
"./tests/test_media.py": "tests/test_media.py",
"./tests/test_storage.py": "tests/test_storage.py",
"./tests/test_running_in_worker.py": "tests/test_running_in_worker.py",
"./tests/test_web.py": "tests/test_web.py",

1
core/tests/python/settings_py.json
View File

@@ -7,6 +7,7 @@
"./tests/test_document.py": "tests/test_document.py",
"./tests/test_fetch.py": "tests/test_fetch.py",
"./tests/test_ffi.py": "tests/test_ffi.py",
"./tests/test_media.py": "tests/test_media.py",
"./tests/test_js_modules.py": "tests/test_js_modules.py",
"./tests/test_storage.py": "tests/test_storage.py",
"./tests/test_running_in_worker.py": "tests/test_running_in_worker.py",

87
core/tests/python/tests/test_media.py Normal file
View File

@@ -0,0 +1,87 @@
""""
Tests for the PyScript media module.
"""
from pyscript import media
import upytest
from pyscript import media
@upytest.skip(
"Uses Pyodide-specific to_js function in MicroPython",
skip_when=upytest.is_micropython,
)
async def test_device_enumeration():
"""Test enumerating media devices."""
devices = await media.list_devices()
assert isinstance(devices, list), "list_devices should return a list"
# If devices are found, verify they have the expected functionality
if devices:
device = devices[0]
# Test real device properties exist (but don't assert on their values)
# Browser security might restrict actual values until permissions are granted
assert hasattr(device, "id"), "Device should have id property"
assert hasattr(device, "kind"), "Device should have kind property"
assert device.kind in [
"videoinput",
"audioinput",
"audiooutput",
], f"Device should have a valid kind, got: {device.kind}"
# Verify dictionary access works with actual device
assert (
device["id"] == device.id
), "Dictionary access should match property access"
assert (
device["kind"] == device.kind
), "Dictionary access should match property access"
@upytest.skip("Waiting on a bug-fix in MicroPython, for this test to work.", skip_when=upytest.is_micropython)
async def test_video_stream_acquisition():
"""Test video stream."""
try:
# Load a video stream
stream = await media.Device.load(video=True)
# Verify we get a real stream with expected properties
assert hasattr(stream, "active"), "Stream should have active property"
# Check for video tracks, but don't fail if permissions aren't granted
if stream._dom_element and hasattr(stream._dom_element, "getVideoTracks"):
tracks = stream._dom_element.getVideoTracks()
if tracks.length > 0:
assert True, "Video stream has video tracks"
except Exception as e:
# If the browser blocks access, the test should still pass
# This is because we're testing the API works, not that permissions are granted
assert (
True
), f"Stream acquisition attempted but may require permissions: {str(e)}"
@upytest.skip("Waiting on a bug-fix in MicroPython, for this test to work.", skip_when=upytest.is_micropython)
async def test_custom_video_constraints():
"""Test loading video with custom constraints."""
try:
# Define custom constraints
constraints = {"width": 640, "height": 480}
# Load stream with custom constraints
stream = await media.Device.load(video=constraints)
# Basic stream property check
assert hasattr(stream, "active"), "Stream should have active property"
# Check for tracks only if we have access
if stream._dom_element and hasattr(stream._dom_element, "getVideoTracks"):
tracks = stream._dom_element.getVideoTracks()
if tracks.length > 0 and hasattr(tracks[0], "getSettings"):
# Settings verification is optional - browsers may handle constraints differently
pass
except Exception as e:
# If the browser blocks access, test that the API structure works
assert True, f"Custom constraint test attempted: {str(e)}"

3
core/tests/python/tests/no_websocket.py → core/tests/python/tests/test_websocket.py
View File

@@ -3,10 +3,12 @@ Exercise the pyscript.Websocket class.
"""
import asyncio
import upytest
from pyscript import WebSocket
@upytest.skip("Websocket tests are disabled.")
async def test_websocket_with_attributes():
"""
Event handlers assigned via object attributes.
@@ -52,6 +54,7 @@ async def test_websocket_with_attributes():
assert closed_flag is True
@upytest.skip("Websocket tests are disabled.")
async def test_websocket_with_init():
"""
Event handlers assigned via __init__ arguments.