test-output directory

mullvad · Dec 18, 2024 · 40e8539 · 40e8539
1 parent 309d0a9
commit 40e8539
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
@@ -481,15 +481,15 @@ jobs:
           TEST_TYPE: ${{ matrix.test-type }}
           BILLING_FLAVOR: oss
           INFRA_FLAVOR: prod
-          TEST_DEVICE_OUTPUTS_DIR: '/sdcard/Download/test-attachments'
+          TEST_DEVICE_OUTPUTS_DIR: '/sdcard/Download/test-outputs'
           REPORT_DIR: ${{ steps.prepare-report-dir.outputs.report_dir }}
         run: ./android/scripts/run-instrumented-tests-repeat.sh ${{ matrix.test-repeat }}
 
       - name: Pull test report
         if: always() && matrix.test-repeat != 0 && github.event.inputs.e2e_tests_infra_flavor == 'stagemole'
         shell: bash -ieo pipefail {0}
         env:
-          TEST_DEVICE_OUTPUTS_DIR: '/sdcard/Download/test-attachments'
+          TEST_DEVICE_OUTPUTS_DIR: '/sdcard/Download/test-outputs'
           REPORT_DIR: ${{ steps.prepare-report-dir.outputs.report_dir }}
         run: ./android/scripts/pull-test-output.sh --test-type ${{ matrix.test-type }}
 
@@ -563,7 +563,7 @@ jobs:
           INVALID_TEST_ACCOUNT_NUMBER: '0000000000000000'
           ENABLE_HIGHLY_RATE_LIMITED_TESTS: ${{ github.event_name == 'schedule' && 'true' || 'false' }}
           ENABLE_ACCESS_TO_LOCAL_API_TESTS: true
-          TEST_DEVICE_OUTPUTS_DIR: '/sdcard/Download/test-attachments'
+          TEST_DEVICE_OUTPUTS_DIR: '/sdcard/Download/test-outputs'
           REPORT_DIR: ${{ steps.prepare-report-dir.outputs.report_dir }}
         run: ./android/scripts/run-instrumented-tests-repeat.sh ${{ matrix.test-repeat }}
 
@@ -573,7 +573,7 @@ jobs:
           github.event.inputs.e2e_tests_infra_flavor == 'stagemole'
         shell: bash -ieo pipefail {0}
         env:
-          TEST_DEVICE_OUTPUTS_DIR: '/sdcard/Download/test-attachments'
+          TEST_DEVICE_OUTPUTS_DIR: '/sdcard/Download/test-outputs'
           REPORT_DIR: ${{ steps.prepare-report-dir.outputs.report_dir }}
         run: ./android/scripts/pull-test-output.sh --test-type e2e
 

diff --git a/...c/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt b/...c/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt
@@ -55,6 +55,6 @@ class CaptureScreenRecordingsExtension : BeforeEachCallback, AfterEachCallback {
 
     companion object {
         val OUTPUT_DIRECTORY =
-            "${Environment.getExternalStorageDirectory().path}/Download/test-attachments/video"
+            "${Environment.getExternalStorageDirectory().path}/Download/test-outputs/attachments/video"
     }
 }
diff --git a/android/test/e2e/README.md b/android/test/e2e/README.md
@@ -58,4 +58,4 @@ docker run --rm --volumes-from gcloud-config -v ${PWD}:/android gcr.io/google.co
 ```
 
 ## Test artefacts
-Test artefacts are stored on the test device in `/sdcard/Download/test-attachments`. In CI this directory is cleared in between each test run, but note that when running tests locally the directory isn't cleared but already existing files are overwritten.
+Test artefacts are stored on the test device in `/sdcard/Download/test-outputs`. In CI this directory is cleared in between each test run, but note that when running tests locally the directory isn't cleared but already existing files are overwritten.