diff --git a/poetry.lock b/poetry.lock index 99b12edfb2..97f950e2ee 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d893d3b28752a00201d9352630b094fe4e0e07fbd2921775485929830ff89ad -size 445868 +oid sha256:2c58f799c5ca463de41f69bd227238e2c03911501d90e656288fcaba07506da5 +size 449347 diff --git a/pyproject.toml b/pyproject.toml index 0db744c34d..78eb7f33a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.pytest.ini_options] minversion = "6.0" -addopts = "--ignore=openpilot/ --ignore=cereal/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=laika_repo/ -Werror --strict-config --strict-markers --durations=10 --random-order" +addopts = "--ignore=openpilot/ --ignore=cereal/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=laika_repo/ -Werror --strict-config --strict-markers --durations=10" #cpp_files = "test_*" # uncomment when agnos has pytest-cpp and remove from CI python_files = "test_*.py" #timeout = "30" # you get this long by default @@ -152,7 +152,6 @@ pytest-subtests = "*" pytest-xdist = "*" pytest-timeout = "*" pytest-timeouts = "*" -pytest-random-order = "*" ruff = "*" scipy = "*" sphinx = "*" diff --git a/selfdrive/controls/tests/test_startup.py b/selfdrive/controls/tests/test_startup.py index 857384b460..6eb803e8aa 100755 --- a/selfdrive/controls/tests/test_startup.py +++ b/selfdrive/controls/tests/test_startup.py @@ -38,12 +38,6 @@ CX5_FW_VERSIONS = [ class TestStartup(unittest.TestCase): - def setUp(self): - self.params = Params() - self.params.clear_all() - self.params.put_bool("Passive", False) - self.params.put_bool("OpenpilotEnabledToggle", True) - @parameterized.expand([ # TODO: test EventName.startup for release branches @@ -74,6 +68,11 @@ class TestStartup(unittest.TestCase): controls_sock = messaging.sub_sock("controlsState") pm = messaging.PubMaster(['can', 'pandaStates']) + params = Params() + params.clear_all() + params.put_bool("Passive", False) + params.put_bool("OpenpilotEnabledToggle", True) + # Build capnn version of FW array if fw_versions is not None: car_fw = [] @@ -91,7 +90,7 @@ class TestStartup(unittest.TestCase): car_fw.append(f) cp.carVin = "1" * 17 cp.carFw = car_fw - self.params.put("CarParamsCache", cp.to_bytes()) + params.put("CarParamsCache", cp.to_bytes()) time.sleep(2) # wait for controlsd to be ready @@ -110,8 +109,8 @@ class TestStartup(unittest.TestCase): for _ in range(1000): # controlsd waits for boardd to echo back that it has changed the multiplexing mode - if not self.params.get_bool("ObdMultiplexingChanged"): - self.params.put_bool("ObdMultiplexingChanged", True) + if not params.get_bool("ObdMultiplexingChanged"): + params.put_bool("ObdMultiplexingChanged", True) msgs = [[addr, 0, b'\x00'*length, 0] for addr, length in finger.items()] pm.send('can', can_list_to_can_capnp(msgs))