Introduce 'mptest list-tentacles' and 'mprest list-tests'

Author: hmaerki

.vscode/launch.json

@@ -40,13 +40,28 @@
             "justMyCode": false,
         },
         {
-            "name": "mptest list",
+            "name": "mptest list-tentacles",
             "type": "debugpy",
             "request": "launch",
             "module": "testbed_micropython.mptest.cli",
             "cwd": "${workspaceFolder}",
             "args": [
-                "list",
+                "list-tentacles",
+            ],
+            "console": "integratedTerminal",
+            "env": {
+                "PYDEVD_DISABLE_FILE_VALIDATION": "1",
+            },
+            "justMyCode": false,
+        },
+        {
+            "name": "mptest list-tests",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "testbed_micropython.mptest.cli",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "list-tests",
             ],
             "console": "integratedTerminal",
             "env": {
@@ -110,30 +125,38 @@
                 // "--only-board=RPI_PICO_W",
                 // "--only-board=ESP32_S3_DEVKIT",
                 // "--only-board=ESP32_C3_DEVKIT",
+                // "--only-board=ESP32_DEVKIT",
                 // "--only-board=RPI_PICO2",
-                // "--skip-board=LOLIN_D1_MINI", // ESP8266_GENERIC
-                "--testresults=${workspaceFolder}/testresults",
+                // "--only-board=PYBV11",
+                // "--only-board=LOLIN_D1_MINI", // ESP8266_GENERIC
+                // "--only-test=RUN-MULTITESTS_MULTIBLUETOOTH",
                 // "--only-test=RUN-MULTITESTS_MULTINET",
                 // "--only-test=RUN-TESTS_NET_INET",
                 // "--only-test=RUN-TESTS_STANDARD",
                 // "--only-test=RUN-TESTS_STANDARD_NATIVE",
+                // "--only-test=RUN-TESTS_STANDARD_VIA_MPY",
                 // "--only-test=RUN-TESTS_EXTMOD_HARDWARE",
+                // "--only-test=RUN-FLASH_FORMAT",
                 // "--only-test=RUN-TESTS_STANDARD_NATIVE",
                 // "--only-test=RUN-TESTS_STANDARD",
                 // "--skip-test=RUN-TESTS_STANDARD",
                 // "--only-test=RUN-TESTS_STANDARD:run-tests.py --via-mpy --test-dirs=micropython",
                 // "--only-test=RUN-TESTS_STANDARD:run-tests.py --test-dirs=micropython",
                 // "--only-board=LOLIN_D1_MINI",
                 // "--skip-test=RUN-MULTITESTS_MULTINET",
-                // "--only-test=RUN-MULTITESTS_MULTINET",
+                "--only-test=RUN-NATMODTESTS",
+                // "--only-board=LOLIN_C3_MINI",
+                // "--only-board=LOLIN_D1_MINI",
                 // "--only-fut=FUT_WLAN",
-                "--skip-fut=FUT_WLAN",
-                "--skip-fut=FUT_BLE",
-                "--no-multiprocessing",
+                // "--skip-fut=FUT_WLAN",
+                // "--skip-fut=FUT_BLE",
+                // "--no-multiprocessing",
                 // "--flash-force",
                 "--flash-skip",
+                // "--count=24",
                 // "--no-git-clean",
                 // "--debug-skip-tests",
+                // "--debug-skip-usb-error",
             ],
             "console": "integratedTerminal",
             "env": {

src/testbed_micropython/mptest/cli.py

@@ -109,8 +109,25 @@ def debugbootmode(
     do_debugbootmode(programmer=programmer)
 
 
-@app.command(name="list", help="List tests and connected tentacles")
-def list_() -> None:
+@app.command(help="List supportet tests")
+def list_tests() -> None:
+    # args = util_testrunner.Args.get_default_args()
+    # testrunner = util_testrunner.TestRunner(args=args)
+    init_logging()
+    for testrun_spec in util_testrunner.get_testrun_specs():
+        print(f"  {testrun_spec.label}")
+        print(f"    help={testrun_spec.helptext}")
+        print(f"    executable={testrun_spec.command_executable}")
+        print(f"      args={testrun_spec.command_args}")
+        print(f"    required_fut={testrun_spec.required_fut.name}")
+        print(f"    tests_todo={testrun_spec.tests_todo}")
+        print("    tests")
+        for tsv in testrun_spec.tsvs_todo:
+            print(f"      {tsv}")
+
+
+@app.command(help="List connected tentacles")
+def list_tentacles() -> None:
     # args = util_testrunner.Args.get_default_args()
     # testrunner = util_testrunner.TestRunner(args=args)
     init_logging()
@@ -124,24 +141,18 @@ def list_() -> None:
     print("Connected")
     for tentacle in connected_tentacles:
         print(f"  {tentacle.label}")
+        print(
+            f"      infra: {tentacle.infra.usb_location_infra} {tentacle.infra.usb_tentacle.pico_infra.serial_port}"
+        )
+        print(
+            f"      dut:   {tentacle.infra.usb_location_dut} {tentacle.infra.usb_tentacle.usb_port_dut.device_text}"
+        )
+
         variants = ",".join(tentacle.tentacle_spec.board_build_variants)
         print(f"    variants={variants}")
         futs = ",".join([fut.name for fut in tentacle.tentacle_spec.futs])
         print(f"    futs={futs}")
 
-    print("")
-    print("Tests")
-    for testrun_spec in util_testrunner.get_testrun_specs():
-        print(f"  {testrun_spec.label}")
-        print(f"    help={testrun_spec.helptext}")
-        print(f"    executable={testrun_spec.command_executable}")
-        print(f"      args={testrun_spec.command_args}")
-        print(f"    required_fut={testrun_spec.required_fut.name}")
-        print(f"    tests_todo={testrun_spec.tests_todo}")
-        print("    tests")
-        for tsv in testrun_spec.tsvs_todo:
-            print(f"      {tsv}")
-
 
 @app.command(help="Flashes all tentacles without running any tests")
 def flash(