From 40e8539794ea17006989854175011daa88181e5f Mon Sep 17 00:00:00 2001
From: Niklas Berglund <niklas.berglund@gmail.com>
Date: Wed, 18 Dec 2024 16:39:48 +0100
Subject: [PATCH] test-output directory

---
 .github/workflows/android-app.yml                         | 8 ++++----
 .../test/common/misc/CaptureScreenRecordingsExtension.kt  | 2 +-
 android/test/e2e/README.md                                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 4dd9f6ef6e6d..6158d217ce49 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -481,7 +481,7 @@ 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 }}
 
@@ -489,7 +489,7 @@ jobs:
         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/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt
index 21cc915482e6..5c82b8ed6f5f 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt
+++ b/android/test/common/src/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
index adbcc042cde7..86d0733bf081 100644
--- 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.