Switch to GitHub actions for E2E tests

seedvault-app · Sep 28, 2023 · 7ed3328 · 7ed3328
1 parent a3b8b1b
commit 7ed3328
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -16,6 +16,7 @@ on:
 jobs:
   instrumentation_tests:
     runs-on: macos-11
+    fail-fast: false
     strategy:
       matrix:
         emulator_type: [default, google_apis]
@@ -38,20 +39,9 @@ jobs:
             ~/.android/adb*
           key: aosp-${{ matrix.emulator_type }}-33
 
-      - name: Test data cache
-        uses: actions/cache@v3
-        id: test-data-cache
-        with:
-          path: backup.tar.gz
-          key: test-data-1
-
       - name: Build Release APK
         run: ./gradlew :app:assembleRelease
 
-      - name: Download test data
-        if: steps.test-data-cache.outputs.cache-hit != 'true'
-        run: wget --quiet https://github.com/seedvault-app/seedvault-test-data/releases/download/1/backup.tar.gz
-
       - name: Create AVD snapshot
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
@@ -101,6 +91,7 @@ jobs:
             sleep 10
             adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
 
+            wget --quiet https://github.com/seedvault-app/seedvault-test-data/releases/download/1/backup.tar.gz
             adb shell mkdir -p /sdcard/seedvault_baseline
             adb push backup.tar.gz /sdcard/seedvault_baseline
             adb wait-for-device

diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeBackupTestBase.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeBackupTestBase.kt
@@ -44,7 +44,7 @@ internal interface LargeBackupTestBase : LargeTestBase {
     fun startBackup() {
         BackupScreen {
 
-            if(!backupManager.isBackupEnabled) {
+            if (!backupManager.isBackupEnabled) {
                 backupSwitch.click()
                 waitUntilIdle()
             }

diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeRestoreTestBase.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeRestoreTestBase.kt
@@ -69,15 +69,15 @@ internal interface LargeRestoreTestBase : LargeTestBase {
 
             waitForInstallResult()
 
-            if(someAppsNotInstalledText.exists()) {
+            if (someAppsNotInstalledText.exists()) {
                 device.pressBack()
             }
 
             nextButton.clickAndWaitForNewWindow()
 
             waitForRestoreDataResult()
 
-            if(someAppsNotRestoredText.exists()) {
+            if (someAppsNotRestoredText.exists()) {
                 device.pressBack()
             }
 

diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt
@@ -186,8 +186,11 @@ internal interface LargeTestBase : KoinComponent {
             val extDir = externalStorageDir
 
             device.executeShellCommand("rm -R $extDir/.SeedVaultAndroidBackup")
-            device.executeShellCommand("cp -R $extDir/${folderName}/.SeedVaultAndroidBackup $extDir")
-            device.executeShellCommand("cp -R $extDir/${folderName}/recovery-code.txt $extDir")
+            device.executeShellCommand(
+                "cp -R $extDir/$folderName/" +
+                    ".SeedVaultAndroidBackup $extDir"
+            )
+            device.executeShellCommand("cp -R $extDir/$folderName/recovery-code.txt $extDir")
 
             BackupScreen {
                 internalStorageButton.clickAndWaitForNewWindow()

diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/SeedvaultLargeTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/SeedvaultLargeTest.kt
@@ -63,8 +63,10 @@ internal abstract class SeedvaultLargeTest :
             val extDir = externalStorageDir
 
             device.executeShellCommand("rm -R $extDir/.SeedVaultAndroidBackup")
-            device.executeShellCommand("cp -R $extDir/$BASELINE_BACKUP_FOLDER/.SeedVaultAndroidBackup $extDir")
-            device.executeShellCommand("cp -R $extDir/$BASELINE_BACKUP_FOLDER/recovery-code.txt $extDir")
+            device.executeShellCommand("cp -R $extDir/$BASELINE_BACKUP_FOLDER/" +
+                ".SeedVaultAndroidBackup $extDir")
+            device.executeShellCommand("cp -R $extDir/$BASELINE_BACKUP_FOLDER/" +
+                "recovery-code.txt $extDir")
         }
 
         if (backupFile.exists()) {