tests: WIP

jorgenmk · jorgenmk · commit 595ce90f3e15 · 2024-11-22T22:57:47.000+01:00
diff --git a/.github/workflows/on_target.yml b/.github/workflows/on_target.yml
@@ -3,46 +3,30 @@ name: Target tests
 on:
   workflow_call:
     inputs:
-      artifact_fw_version:
+      pytest_marker:
         type: string
         required: true
+        default: "-m not slow"
       artifact_run_id:
+        description: The run ID of the workflow to fetch artifacts from
         type: string
         required: true
-      run_log_check_tests:
-        type: boolean
-        required: false
-        default: true
-      run_fota_tests:
-        type: boolean
-        required: false
-        default: true
-      run_fullmfwfota_test:
-        type: boolean
-        required: false
-        default: false
-      run_dfu_tests:
-        type: boolean
-        required: false
-        default: true
-      run_connectivity_bridge_tests:
-        type: boolean
-        required: false
-        default: true
-      run_wifi_location_tests:
-        type: boolean
-        required: false
-        default: true
-      run_modem_trace_tests:
-        type: boolean
-        required: false
-        default: true
-      run_ppk_tests:
-        type: boolean
+      artifact_fw_version:
+        description: The firmware version found under this run_id
+        type: string
+        required: true
+      pytest_path:
+        type: string
         required: false
-        default: false
+        default: tests
+
   workflow_dispatch:
     inputs:
+      pytest_marker:
+        description: The pytest marker to run
+        type: string
+        required: true
+        default: "-m not slow"
       artifact_fw_version:
         description: The firmware version found under this run_id
         type: string
@@ -51,38 +35,11 @@ on:
         description: The run ID of the workflow to fetch artifacts from
         type: string
         required: true
-      run_functional_tests:
-        type: boolean
-        required: true
-        default: true
-      run_fota_tests:
-        type: boolean
-        required: true
-        default: false
-      run_fullmfwfota_test:
-        type: boolean
-        required: true
-        default: false
-      run_dfu_tests:
-        type: boolean
-        required: true
-        default: false
-      run_connectivity_bridge_tests:
-        type: boolean
-        required: true
-        default: false
-      run_wifi_location_tests:
-        type: boolean
-        required: true
-        default: false
-      run_modem_trace_tests:
-        type: boolean
-        required: true
-        default: false
-      run_ppk_tests:
-        type: boolean
-        required: true
-        default: false
+      pytest_path:
+        description: Select test execution path
+        type: string
+        required: false
+        default: tests
 
 jobs:
   target_test:
@@ -139,54 +96,23 @@ jobs:
         working-directory: thingy91x-oob/tests/on_target
         run: |
           mkdir -p results
-          pytest -s -v \
+          pytest -s -v -m "not slow" \
             --junit-xml=results/test-results-dut1.xml \
             --html=results/test-results-dut1.html --self-contained-html \
             tests/test_functional
         env:
           SEGGER: ${{ secrets.SEGGER_DUT_1 }}
+          SEGGER_NRF53: ${{ secrets.SEGGER_DUT_2_EXT_DBG }}
+          SEGGER_NRF91: ${{ secrets.SEGGER_DUT_2_NRF91 }}
           IMEI: ${{ secrets.IMEI_DUT_1 }}
+          UART_ID: ${{ secrets.UART_DUT_2 }}
           FINGERPRINT: ${{ secrets.FINGERPRINT_DUT_1 }}
           LOG_FILENAME: oob_uart_test_log
-          TEST_FUNCTIONAL: ${{ inputs.run_functional_tests }}
-          TEST_FOTA: ${{ inputs.run_fota_tests }}
-          TEST_FOTA_FULLMFW: ${{ inputs.run_fullmfwfota_test }}
-          TEST_WIFI_LOC: ${{ inputs.run_wifi_location_tests }}
-          TEST_TRACES: ${{ inputs.run_modem_trace_tests }}
           TEST_REPORT_NAME: OOB Firwmare Functional Test Report
           DUT1_HW_REVISION: ${{ vars.DUT1_HW_REVISION }}
-
-      - name: Run DFU tests
-        if: ${{ inputs.run_dfu_tests }}
-        working-directory: thingy91x-oob/tests/on_target
-        run: |
-          pytest -s -v -m "dut2 and dfu" \
-            --junit-xml=results/test-results-dfu.xml \
-            --html=results/test-results-bridge.html --self-contained-html \
-            tests/test_bridge
-        env:
-          SEGGER_NRF53: ${{ secrets.SEGGER_DUT_2_EXT_DBG }}
-          SEGGER_NRF91: ${{ secrets.SEGGER_DUT_2_NRF91 }}
-          UART_ID: ${{ secrets.UART_DUT_2 }}
-          TEST_REPORT_NAME: OOB Firwmare Bridge Test Report
-          LOG_FILENAME: oob_dfu_test_log
-
-      - name: Run PPK tests
-        if: ${{ inputs.run_ppk_tests }}
-        continue-on-error: true
-        id: ppk_test
-        working-directory: thingy91x-oob/tests/on_target
-        run: |
-          mkdir -p results
-          pytest -s -v -m dut_ppk \
-            --junit-xml=results/test-results-ppk.xml \
-            --html=results/test-results-ppk.html --self-contained-html \
-            tests/test_ppk
-        env:
           SEGGER: ${{ secrets.SEGGER_DUT_PPK }}
 
       - name: Commit and Push Badge File to gh-pages Branch
-        if: ${{ inputs.run_ppk_tests }}
         continue-on-error: true
         working-directory: thingy91x-oob
         env:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,34 +3,11 @@ name: Build and Test
 on:
   workflow_dispatch:
     inputs:
-      run_fota_tests:
-        type: boolean
+      pytest_marker:
+        type: string
         required: true
-        default: true
-      run_fullmfwfota_test:
-        type: boolean
-        required: true
-        default: false
-      run_dfu_tests:
-        type: boolean
-        required: true
-        default: true
-      run_connectivity_bridge_tests:
-        type: boolean
-        required: true
-        default: true
-      run_wifi_location_tests:
-        type: boolean
-        required: true
-        default: true
-      run_modem_trace_tests:
-        type: boolean
-        required: true
-        default: true
-      run_ppk_tests:
-        type: boolean
-        required: true
-        default: false
+        default: "-m not slow"
+
   schedule:
     - cron: "0 0 * * *"
   push:
@@ -58,43 +35,4 @@ jobs:
     with:
       artifact_fw_version: ${{ needs.build.outputs.version }}
       artifact_run_id: ${{ needs.build.outputs.run_id }}
-      run_fota_tests: >-
-        ${{
-          github.event_name == 'schedule' ||
-          github.event_name == 'push' ||
-          (github.event_name == 'workflow_dispatch' && github.event.inputs.run_fota_tests == 'true')
-        }}
-      run_fullmfwfota_test: >-
-        ${{
-          github.event_name == 'schedule' ||
-          (github.event_name == 'workflow_dispatch' && github.event.inputs.run_fullmfwfota_test == 'true')
-        }}
-      run_dfu_tests: >-
-        ${{
-          github.event_name == 'schedule' ||
-          github.event_name == 'push' ||
-          (github.event_name == 'workflow_dispatch' && github.event.inputs.run_dfu_tests == 'true')
-        }}
-      run_connectivity_bridge_tests: >-
-        ${{
-          github.event_name == 'schedule' ||
-          github.event_name == 'push' ||
-          (github.event_name == 'workflow_dispatch' && github.event.inputs.run_connectivity_bridge_tests == 'true')
-        }}
-      run_wifi_location_tests: >-
-        ${{
-            github.event_name == 'schedule' ||
-            github.event_name == 'push' ||
-            (github.event_name == 'workflow_dispatch' && github.event.inputs.run_wifi_location_tests == 'true')
-        }}
-      run_modem_trace_tests: >-
-        ${{
-          github.event_name == 'schedule' ||
-          github.event_name == 'push' ||
-          (github.event_name == 'workflow_dispatch' && github.event.inputs.run_modem_trace_tests == 'true')
-        }}
-      run_ppk_tests: >-
-        ${{
-            github.event_name == 'schedule' ||
-            (github.event_name == 'workflow_dispatch' && github.event.inputs.run_ppk_tests == 'true')
-        }}
+      pytest_marker: ${{ github.event.inputs.pytest_marker || '' }}
diff --git a/tests/on_target/tests/test_bridge/test_conn_bridge.py b/tests/on_target/tests/test_bridge/test_conn_bridge.py
@@ -74,6 +74,7 @@ def t91x_conn_bridge():
     uart0.stop()
     uart1.stop()
 
+@pytest.mark.slow
 def test_conn_bridge(t91x_conn_bridge):
     t91x_conn_bridge.uart0.wait_for_str(
             "UART0 running at baudrate 115200", timeout=UART_TIMEOUT
diff --git a/tests/on_target/tests/test_bridge/test_serial_dfu.py b/tests/on_target/tests/test_bridge/test_serial_dfu.py
@@ -73,8 +73,7 @@ def t91x_dfu():
     uart.stop()
 
 
-@pytest.mark.dut2
-@pytest.mark.dfu
+@pytest.mark.slow
 def test_dfu(t91x_dfu):
     logger.info("Starting DFU, stopping UART")
     t91x_dfu.uart.stop()
diff --git a/tests/on_target/tests/test_functional/test_fota.py b/tests/on_target/tests/test_functional/test_fota.py
@@ -74,7 +74,6 @@ def _run_fota(bundleId, fota_type, fotatimeout=APP_FOTA_TIMEOUT, test_fota_resum
 
     return _run_fota
 
-@pytest.mark.skipif(not os.getenv("TEST_FOTA"), reason="Deselected")
 def test_app_fota(t91x_board, hex_file, run_fota_fixture):
     # Get latest APP fota bundle
     results = t91x_board.fota.get_fota_bundles()
@@ -91,7 +90,7 @@ def test_app_fota(t91x_board, hex_file, run_fota_fixture):
 
     run_fota_fixture(bundleId=latest_app_bundle["bundleId"], fota_type="app", test_fota_resumption=True)
 
-@pytest.mark.skipif(not os.getenv("TEST_FOTA"), reason="Deselected")
+
 def test_delta_mfw_fota(t91x_board, hex_file, run_fota_fixture):
     # Flash with mfw201
     flash_device(os.path.abspath(MFW_201_FILEPATH))
@@ -102,6 +101,6 @@ def test_delta_mfw_fota(t91x_board, hex_file, run_fota_fixture):
     # Restore mfw201
     flash_device(os.path.abspath(MFW_201_FILEPATH))
 
-@pytest.mark.skipif(not os.getenv("TEST_FOTA_FULLMFW"), reason="Deselected")
+@pytest.mark.slow
 def test_full_mfw_fota(t91x_board, hex_file, run_fota_fixture):
     run_fota_fixture(FULL_MFW_BUNDLEID, "full", FULL_MFW_FOTA_TIMEOUT)
diff --git a/tests/on_target/tests/test_functional/test_location.py b/tests/on_target/tests/test_functional/test_location.py
@@ -14,11 +14,9 @@
 
 logger = get_logger()
 
-@pytest.mark.skipif(not os.getenv("TEST_WIFI_LOC"), reason="Deselected")
 def test_wifi_location(t91x_board, hex_file):
     run_location(t91x_board, hex_file, location_method="Wi-Fi")
 
-@pytest.mark.skipif(not os.getenv("TEST_GNSS"), reason="Deselected")
 def test_gnss_location(t91x_board, hex_file):
     run_location(t91x_board, hex_file, location_method="GNSS")
 
diff --git a/tests/on_target/tests/test_functional/test_uart_output.py b/tests/on_target/tests/test_functional/test_uart_output.py
@@ -14,7 +14,6 @@
 
 logger = get_logger()
 
-@pytest.mark.skipif(not os.getenv("TEST_FUNCTIONAL"), reason="Deselected")
 def test_uart_output(t91x_board, hex_file):
     flash_device(os.path.abspath(hex_file))
     t91x_board.uart.xfactoryreset()
