From 5941ecef7d2ae380dc2354ca55f86ea7d572a04d Mon Sep 17 00:00:00 2001 From: Jorgen Kvalvaag Date: Thu, 28 Nov 2024 08:48:43 +0100 Subject: [PATCH] tests: Fix workflow Set default value for pytest_path. Fix wrong fixture. Move memfault test. Signed-off-by: Jorgen Kvalvaag --- .github/workflows/on_target.yml | 7 +++++-- tests/on_target/tests/test_functional/test_fota.py | 2 +- .../on_target/tests/{ => test_functional}/test_memfault.py | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) rename tests/on_target/tests/{ => test_functional}/test_memfault.py (98%) diff --git a/.github/workflows/on_target.yml b/.github/workflows/on_target.yml index 1e45ecde..4a9b5946 100644 --- a/.github/workflows/on_target.yml +++ b/.github/workflows/on_target.yml @@ -14,7 +14,7 @@ on: required: false pytest_path: type: string - required: true + required: false default: tests workflow_dispatch: @@ -34,7 +34,7 @@ on: pytest_path: description: Select test execution path type: string - required: true + required: false default: tests jobs: @@ -107,6 +107,9 @@ jobs: TEST_REPORT_NAME: OOB Firwmare Test Report DUT1_HW_REVISION: ${{ vars.DUT1_HW_REVISION }} SEGGER_PPK: ${{ secrets.SEGGER_DUT_PPK }} + MEMFAULT_ORGANIZATION_TOKEN: ${{ secrets.MEMFAULT_ORGANIZATION_TOKEN }} + MEMFAULT_ORGANIZATION_SLUG: ${{ vars.MEMFAULT_ORGANIZATION_SLUG }} + MEMFAULT_PROJECT_SLUG: ${{ vars.MEMFAULT_PROJECT_SLUG }} - name: Commit and Push Badge File to gh-pages Branch continue-on-error: true diff --git a/tests/on_target/tests/test_functional/test_fota.py b/tests/on_target/tests/test_functional/test_fota.py index 3174202a..c7552e15 100644 --- a/tests/on_target/tests/test_functional/test_fota.py +++ b/tests/on_target/tests/test_functional/test_fota.py @@ -74,7 +74,7 @@ def _run_fota(bundleId, fota_type, fotatimeout=APP_FOTA_TIMEOUT, test_fota_resum return _run_fota -def test_app_fota(t91x_board, hex_file, run_fota_fixture): +def test_app_fota(t91x_fota, hex_file, run_fota_fixture): ''' Test application FOTA on nrf9151 ''' diff --git a/tests/on_target/tests/test_memfault.py b/tests/on_target/tests/test_functional/test_memfault.py similarity index 98% rename from tests/on_target/tests/test_memfault.py rename to tests/on_target/tests/test_functional/test_memfault.py index fee04e40..57d77086 100644 --- a/tests/on_target/tests/test_memfault.py +++ b/tests/on_target/tests/test_functional/test_memfault.py @@ -62,8 +62,6 @@ def wait_for_heartbeat(timestamp_old_heartbeat_evt): else: raise AssertionError("No new heartbeat event observed") -@pytest.mark.memfault -@pytest.mark.dut1 def test_memfault(t91x_board, hex_file): flash_device(os.path.abspath(hex_file)) t91x_board.uart.xfactoryreset()