From 36cadd03ee35d63eea0add25d57978d384a95a93 Mon Sep 17 00:00:00 2001
From: Ben Meadors <thebentern@tuta.io>
Date: Sun, 25 Aug 2024 15:27:59 -0500
Subject: [PATCH] wip

---
 test/end2end/flash.py | 19 ++++++++++++++++---
 test/end2end/test.py  | 22 +++++++++++++---------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/test/end2end/flash.py b/test/end2end/flash.py
index 6c8b18acb..11f767133 100644
--- a/test/end2end/flash.py
+++ b/test/end2end/flash.py
@@ -1,6 +1,9 @@
-import usb.core
+# trunk-ignore-all(bandit/B404)
 import subprocess
 
+import usb.core
+
+
 def find_usb_device(vendor_id, product_id):
     # Find USB devices
     dev = usb.core.find(find_all=True)
@@ -10,11 +13,21 @@ def find_usb_device(vendor_id, product_id):
             return cfg
     return None
 
+
 # Flash esp32 target
 def flash_esp32(pio_env, port):
     # Flash the ESP32 target
-    subprocess.run(["platformio", "run", "-e", pio_env, "-t", "upload", "-p", port])
+    # trunk-ignore(bandit/B603)
+    # trunk-ignore(bandit/B607)
+    subprocess.run(
+        ["platformio", "run", "-e", pio_env, "-t", "upload", "--upload-port", port]
+    )
+
 
 def flash_nrf52(pio_env, port):
     # Flash the nrf52 target
-    subprocess.run(["platformio", "run", "-e", pio_env, "-t", "upload", "-p", port])
\ No newline at end of file
+    # trunk-ignore(bandit/B603)
+    # trunk-ignore(bandit/B607)
+    subprocess.run(
+        ["platformio", "run", "-e", pio_env, "-t", "upload", "--upload-port", port]
+    )
diff --git a/test/end2end/test.py b/test/end2end/test.py
index 72a1f1326..ef910ae02 100644
--- a/test/end2end/test.py
+++ b/test/end2end/test.py
@@ -1,15 +1,15 @@
-import sys
-
-import pytest
+import flash
 import meshtastic
 import meshtastic.serial_interface
-from datetime import datetime
-import flash
+import pytest
 
-heltec_v3 = ["COM17", "heltec-v3", "esp32"]
+# from datetime import datetime
+
+heltec_v3 = ["/dev/cu.usbserial-0001", "heltec-v3", "esp32"]
 tbeam = ["COM18", "tbeam", "esp32"]
 rak4631 = ["COM19", "rak4631", "nrf52"]
 
+
 @pytest.fixture(scope="module", params=[heltec_v3])
 def device(request):
     port = request.param[0]
@@ -22,7 +22,8 @@ def device(request):
         flash.flash_nrf52(pio_env=pio_env, port=port)
         # factory reset
     yield meshtastic.serial_interface.SerialInterface(port)
-    # Tear down device
+    # Tear down devices
+
 
 # Test want_config responses from device
 def test_get_info(device):
@@ -30,7 +31,10 @@ def test_get_info(device):
     assert len(device.nodes) > 0, "Expected at least one node in the device NodeDB"
     assert device.localNode.localConfig is not None, "Expected LocalConfig to be set"
     assert device.localNode.moduleConfig is not None, "Expected ModuleConfig to be set"
-    assert len(device.localNode.channels) > 0, "Expected at least one channel in the device"
+    assert (
+        len(device.localNode.channels) > 0
+    ), "Expected at least one channel in the device"
+
 
 if __name__ == "__main__":
-    pytest.main()
\ No newline at end of file
+    pytest.main()