From d39b31aed1f63075d83fa29cad3a2d62b28d6a8b Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Fri, 12 Jan 2024 20:36:38 -0500 Subject: [PATCH] remove get_url instances (#30986) rm --- selfdrive/locationd/test/test_locationd_scenarios.py | 6 ++---- selfdrive/test/process_replay/test_debayer.py | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/selfdrive/locationd/test/test_locationd_scenarios.py b/selfdrive/locationd/test/test_locationd_scenarios.py index b1792e0fd8..4cfbd6f8a9 100755 --- a/selfdrive/locationd/test/test_locationd_scenarios.py +++ b/selfdrive/locationd/test/test_locationd_scenarios.py @@ -5,12 +5,10 @@ import numpy as np from collections import defaultdict from enum import Enum - -from openpilot.selfdrive.test.openpilotci import get_url from openpilot.tools.lib.logreader import LogReader from openpilot.selfdrive.test.process_replay.process_replay import replay_process_with_name -TEST_ROUTE, TEST_SEG_NUM = "ff2bd20623fcaeaa|2023-09-05--10-14-54", 4 +TEST_ROUTE = "ff2bd20623fcaeaa|2023-09-05--10-14-54/4" GPS_MESSAGES = ['gpsLocationExternal', 'gpsLocation'] SELECT_COMPARE_FIELDS = { 'yaw_rate': ['angularVelocityCalibrated', 'value', 2], @@ -108,7 +106,7 @@ class TestLocationdScenarios(unittest.TestCase): @classmethod def setUpClass(cls): - cls.logs = list(LogReader(get_url(TEST_ROUTE, TEST_SEG_NUM))) + cls.logs = list(LogReader(TEST_ROUTE)) def test_base(self): """ diff --git a/selfdrive/test/process_replay/test_debayer.py b/selfdrive/test/process_replay/test_debayer.py index a6e6955dbf..baa9e255e6 100755 --- a/selfdrive/test/process_replay/test_debayer.py +++ b/selfdrive/test/process_replay/test_debayer.py @@ -8,14 +8,13 @@ import pyopencl as cl # install with `PYOPENCL_CL_PRETEND_VERSION=2.0 pip insta from openpilot.system.hardware import PC, TICI from openpilot.common.basedir import BASEDIR -from openpilot.selfdrive.test.openpilotci import BASE_URL, get_url +from openpilot.selfdrive.test.openpilotci import BASE_URL from openpilot.system.version import get_commit from openpilot.system.camerad.snapshot.snapshot import yuv_to_rgb from openpilot.tools.lib.logreader import LogReader from openpilot.tools.lib.filereader import FileReader -TEST_ROUTE = "8345e3b82948d454|2022-05-04--13-45-33" -SEGMENT = 0 +TEST_ROUTE = "8345e3b82948d454|2022-05-04--13-45-33/0" FRAME_WIDTH = 1928 FRAME_HEIGHT = 1208 @@ -116,7 +115,7 @@ if __name__ == "__main__": ref_commit_fn = os.path.join(replay_dir, "debayer_replay_ref_commit") # load logs - lr = list(LogReader(get_url(TEST_ROUTE, SEGMENT))) + lr = list(LogReader(TEST_ROUTE)) # run replay frames = debayer_replay(lr)