Camera metadata includes subclass name, and test
This commit is contained in:
parent
ac9852a7ad
commit
5019884175
5 changed files with 215 additions and 26 deletions
|
|
@ -4,8 +4,6 @@ Tests for specific camera hardware are in the hardware_specific_tests directory.
|
|||
on camera functionality using the simulation camera are in "test_camera".
|
||||
"""
|
||||
|
||||
import pytest
|
||||
|
||||
from labthings_fastapi.testing import create_thing_without_server
|
||||
|
||||
from openflexure_microscope_server.things.camera import BaseCamera
|
||||
|
|
@ -13,28 +11,6 @@ from openflexure_microscope_server.things.camera.opencv import OpenCVCamera
|
|||
from openflexure_microscope_server.things.camera.simulation import SimulatedCamera
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_picam_thing(mocker):
|
||||
"""Import PiCamera without hardware well enough to get a ThingDescription."""
|
||||
dummy_cam = mocker.Mock()
|
||||
mock_picamera2 = mocker.MagicMock()
|
||||
mock_picamera2.return_value.__enter__.return_value = dummy_cam
|
||||
mock_picamera2.return_value.__exit__.return_value = None
|
||||
|
||||
mocker.patch.dict(
|
||||
"sys.modules",
|
||||
{
|
||||
"picamera2": mock_picamera2,
|
||||
"picamera2.encoders": mocker.Mock(),
|
||||
"picamera2.outputs": mocker.Mock(),
|
||||
},
|
||||
)
|
||||
|
||||
from openflexure_microscope_server.things.camera.picamera import StreamingPiCamera2
|
||||
|
||||
return create_thing_without_server(StreamingPiCamera2)
|
||||
|
||||
|
||||
def _get_clean_camera_description(camera_thing):
|
||||
"""Return actions and properties for a camera Thing, separating those exposed to the UI.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue