revert modified files and test cases

espressif · Nov 12, 2024 · ce78d61 · ce78d61
1 parent 1ca0e6d
commit ce78d61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/build_and_run_test_app_usb.yml b/.github/workflows/build_and_run_test_app_usb.yml
@@ -12,8 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        #idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"]
-        idf_ver: ["latest"]
+        idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"]
     runs-on: ubuntu-20.04
     container: espressif/idf:${{ matrix.idf_ver }}
     steps:
@@ -42,15 +41,14 @@ jobs:
             **/test_app*/**/build_esp*/config/sdkconfig.json
           if-no-files-found: error
 
-  run-target-usb-host:
-    name: Run USB Host TestApp on target
+  run-target:
+    name: Run USB Host and Device TestApps on target
     if: ${{ github.repository_owner == 'espressif' }}
     needs: build
     strategy:
       fail-fast: false
       matrix:
-        #idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"]
-        idf_ver: ["latest"]
+        idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"]
         idf_target: ["esp32s2"]
         runner_tag: ["usb_host", "usb_device"]
     runs-on: [self-hosted, linux, docker, "${{ matrix.idf_target }}", "${{ matrix.runner_tag }}"]

diff --git a/device/esp_tinyusb/test_apps/cdc_and_usb_device/pytest_cdc.py b/device/esp_tinyusb/test_apps/cdc_and_usb_device/pytest_cdc.py
@@ -27,17 +27,13 @@ def test_usb_device_cdc(dut) -> None:
     dut.expect_exact('Press ENTER to see the list of tests.')
     dut.write('[cdc]')
     dut.expect_exact('TinyUSB: TinyUSB Driver installed')
-    sleep(5)  # Some time for the OS to enumerate our USB device
+    sleep(2)  # Some time for the OS to enumerate our USB device
 
     # Find devices with Espressif TinyUSB VID/PID
     s = []
     ports = comports()
 
     for port, _, hwid in ports:
-        print(port, hwid)
-
-    for port, _, hwid in ports:
-        print(port)
         if '303A:4002' in hwid:
             s.append(port)