diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-07-30 14:35:51 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-07-31 14:47:19 +0200 |
| commit | 287f4a0c8ed77fefa38ad0df2bba1ae200844588 (patch) | |
| tree | 69c83d2bfebe3c03423518e9445c82c00478df71 /android/scripts | |
| parent | 59929c15536a4a7510e9e7a5dd844bd3332ad8a4 (diff) | |
| download | mullvadvpn-287f4a0c8ed77fefa38ad0df2bba1ae200844588.tar.xz mullvadvpn-287f4a0c8ed77fefa38ad0df2bba1ae200844588.zip | |
Match on success message
Diffstat (limited to 'android/scripts')
| -rwxr-xr-x | android/scripts/run-instrumented-tests.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/android/scripts/run-instrumented-tests.sh b/android/scripts/run-instrumented-tests.sh index f966bcfa12..f43b3a9972 100755 --- a/android/scripts/run-instrumented-tests.sh +++ b/android/scripts/run-instrumented-tests.sh @@ -8,7 +8,7 @@ cd "$SCRIPT_DIR" AUTO_FETCH_TEST_HELPER_APKS=${AUTO_FETCH_TEST_HELPER_APKS:-"false"} APK_BASE_DIR=${APK_BASE_DIR:-"$SCRIPT_DIR/.."} -LOG_FAILURE_MESSAGE="FAILURES!!!" +LOG_SUCCESS_REGEX="OK \([0-9]+ tests\)" ORCHESTRATOR_URL=https://dl.google.com/android/maven2/androidx/test/orchestrator/1.5.0/orchestrator-1.5.0.apk TEST_SERVICES_URL=https://dl.google.com/android/maven2/androidx/test/services/test-services/1.5.0/test-services-1.5.0.apk @@ -226,15 +226,15 @@ adb uninstall androidx.test.services || echo "Test services package not installe adb uninstall androidx.test.orchestrator || echo "Test orchestrator package not installed" echo "" -echo "### Checking logs for failures ###" -if grep -q "$LOG_FAILURE_MESSAGE" "$INSTRUMENTATION_LOG_FILE_PATH"; then +echo "### Checking logs for success message ###" +if grep -q -E "$LOG_SUCCESS_REGEX" "$INSTRUMENTATION_LOG_FILE_PATH"; then + echo "Success, no failures!" +else echo "One or more tests failed, see logs for more details." echo "Collecting report..." adb pull "$DEVICE_SCREENSHOT_PATH" "$LOCAL_SCREENSHOT_PATH" || echo "No screenshots" adb logcat -d > "$LOGCAT_FILE_PATH" exit 1 -else - echo "No failures!" fi if [[ -n ${TEMP_DOWNLOAD_DIR-} ]]; then |