ci: remove the old `phone_only` test marker (#34168)

* std

* ruff
fix-isp^2
Maxime Desroches 5 months ago committed by GitHub
parent d7d9c40242
commit c7889a16be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      selfdrive/pandad/tests/test_pandad_loopback.py
  2. 3
      selfdrive/pandad/tests/test_pandad_spi.py
  3. 9
      selfdrive/test/helpers.py
  4. 5
      system/camerad/test/test_exposure.py

@ -14,7 +14,7 @@ from openpilot.common.params import Params
from openpilot.common.timeout import Timeout from openpilot.common.timeout import Timeout
from openpilot.selfdrive.pandad import can_list_to_can_capnp from openpilot.selfdrive.pandad import can_list_to_can_capnp
from openpilot.system.hardware import TICI from openpilot.system.hardware import TICI
from openpilot.selfdrive.test.helpers import phone_only, with_processes from openpilot.selfdrive.test.helpers import with_processes
@retry(attempts=3) @retry(attempts=3)
@ -72,7 +72,6 @@ class TestBoarddLoopback:
os.environ['STARTED'] = '1' os.environ['STARTED'] = '1'
os.environ['BOARDD_LOOPBACK'] = '1' os.environ['BOARDD_LOOPBACK'] = '1'
@phone_only
@with_processes(['pandad']) @with_processes(['pandad'])
def test_loopback(self): def test_loopback(self):
num_pandas = 2 if TICI and "SINGLE_PANDA" not in os.environ else 1 num_pandas = 2 if TICI and "SINGLE_PANDA" not in os.environ else 1

@ -7,7 +7,7 @@ import random
import cereal.messaging as messaging import cereal.messaging as messaging
from cereal.services import SERVICE_LIST from cereal.services import SERVICE_LIST
from openpilot.system.hardware import HARDWARE from openpilot.system.hardware import HARDWARE
from openpilot.selfdrive.test.helpers import phone_only, with_processes from openpilot.selfdrive.test.helpers import with_processes
from openpilot.selfdrive.pandad.tests.test_pandad_loopback import setup_pandad, send_random_can_messages from openpilot.selfdrive.pandad.tests.test_pandad_loopback import setup_pandad, send_random_can_messages
JUNGLE_SPAM = "JUNGLE_SPAM" in os.environ JUNGLE_SPAM = "JUNGLE_SPAM" in os.environ
@ -23,7 +23,6 @@ class TestBoarddSpi:
if not JUNGLE_SPAM: if not JUNGLE_SPAM:
os.environ['BOARDD_LOOPBACK'] = '1' os.environ['BOARDD_LOOPBACK'] = '1'
@phone_only
@with_processes(['pandad']) @with_processes(['pandad'])
def test_spi_corruption(self, subtests): def test_spi_corruption(self, subtests):
setup_pandad(1) setup_pandad(1)

@ -10,7 +10,6 @@ from functools import wraps
import cereal.messaging as messaging import cereal.messaging as messaging
from openpilot.common.params import Params from openpilot.common.params import Params
from openpilot.system.manager.process_config import managed_processes from openpilot.system.manager.process_config import managed_processes
from openpilot.system.hardware import PC
from openpilot.system.version import training_version, terms_version from openpilot.system.version import training_version, terms_version
@ -29,14 +28,6 @@ def set_params_enabled():
msg.liveCalibration.rpyCalib = [0.0, 0.0, 0.0] msg.liveCalibration.rpyCalib = [0.0, 0.0, 0.0]
params.put("CalibrationParams", msg.to_bytes()) params.put("CalibrationParams", msg.to_bytes())
def phone_only(f):
@wraps(f)
def wrap(self, *args, **kwargs):
if PC:
pytest.skip("This test is not meant to run on PC")
return f(self, *args, **kwargs)
return wrap
def release_only(f): def release_only(f):
@wraps(f) @wraps(f)
def wrap(self, *args, **kwargs): def wrap(self, *args, **kwargs):

@ -1,12 +1,14 @@
import time import time
import numpy as np import numpy as np
import pytest
from openpilot.selfdrive.test.helpers import with_processes, phone_only from openpilot.selfdrive.test.helpers import with_processes
from openpilot.system.camerad.snapshot.snapshot import get_snapshots from openpilot.system.camerad.snapshot.snapshot import get_snapshots
TEST_TIME = 45 TEST_TIME = 45
REPEAT = 5 REPEAT = 5
@pytest.mark.tici
class TestCamerad: class TestCamerad:
@classmethod @classmethod
def setup_class(cls): def setup_class(cls):
@ -28,7 +30,6 @@ class TestCamerad:
print([i_median, i_mean]) print([i_median, i_mean])
return med_ex[0] < i_median < med_ex[1] and mean_ex[0] < i_mean < mean_ex[1] return med_ex[0] < i_median < med_ex[1] and mean_ex[0] < i_mean < mean_ex[1]
@phone_only
@with_processes(['camerad']) @with_processes(['camerad'])
def test_camera_operation(self): def test_camera_operation(self):
passed = 0 passed = 0

Loading…
Cancel
Save