Revert "Remove @require_x"

This reverts commit 8a7b5c45c7.
This commit is contained in:
Remi Cadene
2024-09-26 14:35:26 +02:00
parent 8a7b5c45c7
commit 395720a5de
5 changed files with 150 additions and 90 deletions

View File

@@ -25,11 +25,7 @@ import numpy as np
import pytest
from lerobot.common.robot_devices.utils import RobotDeviceAlreadyConnectedError, RobotDeviceNotConnectedError
from tests.utils import (
TEST_CAMERA_TYPES,
make_camera,
mock_camera_or_skip_test_when_not_available,
)
from tests.utils import TEST_CAMERA_TYPES, make_camera, require_camera
# Maximum absolute difference between two consecutive images recored by a camera.
# This value differs with respect to the camera.
@@ -41,7 +37,8 @@ def compute_max_pixel_difference(first_image, second_image):
@pytest.mark.parametrize("camera_type, mock", TEST_CAMERA_TYPES)
def test_camera(monkeypatch, camera_type, mock):
@require_camera
def test_camera(request, camera_type, mock):
"""Test assumes that `camera.read()` returns the same image when called multiple times in a row.
So the environment should not change (you shouldnt be in front of the camera) and the camera should not be moving.
@@ -51,8 +48,6 @@ def test_camera(monkeypatch, camera_type, mock):
# TODO(rcadene): measure fps in nightly?
# TODO(rcadene): test logs
mock_camera_or_skip_test_when_not_available(monkeypatch, camera_type, mock)
# Test instantiating
camera = make_camera(camera_type)
@@ -146,10 +141,9 @@ def test_camera(monkeypatch, camera_type, mock):
@pytest.mark.parametrize("camera_type, mock", TEST_CAMERA_TYPES)
def test_save_images_from_cameras(tmpdir, monkeypatch, camera_type, mock):
@require_camera
def test_save_images_from_cameras(tmpdir, request, camera_type, mock):
# TODO(rcadene): refactor
mock_camera_or_skip_test_when_not_available(monkeypatch, camera_type, mock)
if camera_type == "opencv":
from lerobot.common.robot_devices.cameras.opencv import save_images_from_cameras
elif camera_type == "intelrealsense":