From bff894edf4f57bbf57fb53b4b02a3a30d222cf59 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 5 Dec 2024 08:44:37 -0500 Subject: [PATCH 1/3] Disable flaky test --- .github/workflows/java-tests.yaml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 473cd482357a75..21700f16729faa 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -236,17 +236,19 @@ jobs: --tool-args "onnetwork-long --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \ --factoryreset \ ' - - name: Run Pairing Onnetwork and get diagnostic log Test - run: | - scripts/run_in_python_env.sh out/venv \ - './scripts/tests/run_java_test.py \ - --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \ - --app-args "--discriminator 3840 --interface-id -1 --crash_log ./crashLog.log --end_user_support_log ./enduser.log --network_diagnostics_log ./network.log" \ - --tool-path out/linux-x64-java-matter-controller \ - --tool-cluster "bdx" \ - --tool-args "onnetwork-long-downloadLog --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000 --logType CrashLogs --fileName ./crashLog.log" \ - --factoryreset \ - ' + # TODO: test below is disabled because it seems flaky (crashes on pool not being empty on app exit) + # See: https://github.com/project-chip/connectedhomeip/issues/36734 + # - name: Run Pairing Onnetwork and get diagnostic log Test + # run: | + # scripts/run_in_python_env.sh out/venv \ + # './scripts/tests/run_java_test.py \ + # --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \ + # --app-args "--discriminator 3840 --interface-id -1 --crash_log ./crashLog.log --end_user_support_log ./enduser.log --network_diagnostics_log ./network.log" \ + # --tool-path out/linux-x64-java-matter-controller \ + # --tool-cluster "bdx" \ + # --tool-args "onnetwork-long-downloadLog --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000 --logType CrashLogs --fileName ./crashLog.log" \ + # --factoryreset \ + # ' - name: Run Pairing Onnetwork Test run: | scripts/run_in_python_env.sh out/venv \ From fc8005616fe643526cbfe04cf0b4c4b8ad0d16dd Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 5 Dec 2024 08:48:32 -0500 Subject: [PATCH 2/3] Fix disabling logic --- .github/workflows/java-tests.yaml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 21700f16729faa..3afaaf7ce20cea 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -236,19 +236,20 @@ jobs: --tool-args "onnetwork-long --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \ --factoryreset \ ' - # TODO: test below is disabled because it seems flaky (crashes on pool not being empty on app exit) - # See: https://github.com/project-chip/connectedhomeip/issues/36734 - # - name: Run Pairing Onnetwork and get diagnostic log Test - # run: | - # scripts/run_in_python_env.sh out/venv \ - # './scripts/tests/run_java_test.py \ - # --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \ - # --app-args "--discriminator 3840 --interface-id -1 --crash_log ./crashLog.log --end_user_support_log ./enduser.log --network_diagnostics_log ./network.log" \ - # --tool-path out/linux-x64-java-matter-controller \ - # --tool-cluster "bdx" \ - # --tool-args "onnetwork-long-downloadLog --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000 --logType CrashLogs --fileName ./crashLog.log" \ - # --factoryreset \ - # ' + - name: Run Pairing Onnetwork and get diagnostic log Test + # TODO: test below is disabled because it seems flaky (crashes on pool not being empty on app exit) + # See: https://github.com/project-chip/connectedhomeip/issues/36734 + if: false + run: | + scripts/run_in_python_env.sh out/venv \ + './scripts/tests/run_java_test.py \ + --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \ + --app-args "--discriminator 3840 --interface-id -1 --crash_log ./crashLog.log --end_user_support_log ./enduser.log --network_diagnostics_log ./network.log" \ + --tool-path out/linux-x64-java-matter-controller \ + --tool-cluster "bdx" \ + --tool-args "onnetwork-long-downloadLog --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000 --logType CrashLogs --fileName ./crashLog.log" \ + --factoryreset \ + ' - name: Run Pairing Onnetwork Test run: | scripts/run_in_python_env.sh out/venv \ From 3077dc095bc6429c9f8d1f01a2648214a7a4ac30 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 5 Dec 2024 08:50:27 -0500 Subject: [PATCH 3/3] make disabling logic consistent in java --- .github/workflows/java-tests.yaml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 3afaaf7ce20cea..895e241e13dd10 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -191,18 +191,19 @@ jobs: --tool-args "already-discovered --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \ --factoryreset \ ' - # Disabled due to failure: https://github.com/project-chip/connectedhomeip/issues/27361 - # - name: Run Pairing Address-PaseOnly Test - # run: | - # scripts/run_in_python_env.sh out/venv \ - # './scripts/tests/run_java_test.py \ - # --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \ - # --app-args "--discriminator 3840 --interface-id -1" \ - # --tool-path out/linux-x64-java-matter-controller \ - # --tool-cluster "pairing" \ - # --tool-args "address-paseonly --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \ - # --factoryreset \ - # ' + - name: Run Pairing Address-PaseOnly Test + # Disabled due to failure: https://github.com/project-chip/connectedhomeip/issues/27361 + if: false + run: | + scripts/run_in_python_env.sh out/venv \ + './scripts/tests/run_java_test.py \ + --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \ + --app-args "--discriminator 3840 --interface-id -1" \ + --tool-path out/linux-x64-java-matter-controller \ + --tool-cluster "pairing" \ + --tool-args "address-paseonly --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \ + --factoryreset \ + ' - name: Run Pairing SetupQRCode Test run: | scripts/run_in_python_env.sh out/venv \