From 6fe7fcd6e9a31a0b5101c7b0fe7a2867168738b4 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Mon, 31 May 2021 14:55:20 +0200
Subject: [PATCH] Ensure Athena is not running during onroad tests (#21088)

* ensure Athena is not running during onroad tests

* do from unittest
---
 selfdrive/test/test_onroad.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/selfdrive/test/test_onroad.py b/selfdrive/test/test_onroad.py
index 6fcec8b975..96b359dddf 100755
--- a/selfdrive/test/test_onroad.py
+++ b/selfdrive/test/test_onroad.py
@@ -12,6 +12,7 @@ import cereal.messaging as messaging
 from cereal.services import service_list
 from common.basedir import BASEDIR
 from common.timeout import Timeout
+from common.params import Params
 from selfdrive.hardware import TICI
 from selfdrive.loggerd.config import ROOT
 from selfdrive.test.helpers import set_params_enabled
@@ -98,6 +99,11 @@ class TestOnroad(unittest.TestCase):
     os.environ['FINGERPRINT'] = "TOYOTA COROLLA TSS2 2019"
     set_params_enabled()
 
+    # Make sure athena isn't running
+    Params().delete("DongleId")
+    Params().delete("AthenadPid")
+    subprocess.check_call(["pkill", "-9", "-f", "athena"])
+
     logger_root = Path(ROOT)
     initial_segments = set()
     if logger_root.exists():