Try to fix issue where our transport doesn't get registered in emulator

seedvault-app · Jun 6, 2024 · fec7fbf · fec7fbf
1 parent 0e224b1
commit fec7fbf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/.github/scripts/run_tests.sh b/.github/scripts/run_tests.sh
@@ -3,21 +3,18 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-adb root
-sleep 5
-adb remount
+echo "Disable auto-restore"
+adb shell bmgr autorestore false
 
 echo "Installing Seedvault app..."
-adb shell mkdir -p /system/priv-app/Seedvault
-adb push app/build/outputs/apk/release/app-release.apk /system/priv-app/Seedvault/Seedvault.apk
-
-echo "Installing Seedvault permissions..."
-adb push permissions_com.stevesoltys.seedvault.xml /system/etc/permissions/privapp-permissions-seedvault.xml
-adb push allowlist_com.stevesoltys.seedvault.xml /system/etc/sysconfig/allowlist-seedvault.xml
-
-echo "Setting Seedvault transport..."
-sleep 10
-adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
+#echo "Install Android Test app"
+#adb install app/build/outputs/apk/release/app-release.apk
+./gradlew --stacktrace :app:installDebugAndroidTest
+sleep 60
+
+#echo "Setting Seedvault transport..."
+#sleep 10
+#adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport | grep "Unknown transport" && exit 1
 
 D2D_BACKUP_TEST=$1
 

diff --git a/app/development/scripts/provision_emulator.sh b/app/development/scripts/provision_emulator.sh
@@ -79,10 +79,11 @@ echo "Rebooting emulator..."
 $ADB reboot
 $ADB wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;'
 
-echo "Setting backup transport to Seedvault..."
-$ADB shell bmgr enable true
-sleep 5
-$ADB shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
+echo "Disabling backup..."
+#echo "Setting backup transport to Seedvault..."
+$ADB shell bmgr enable false
+#sleep 5
+#$ADB shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
 
 echo "Downloading and extracting test backup to '/sdcard/seedvault_baseline'..."
 

diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt
@@ -113,9 +113,11 @@ internal interface LargeTestBase : KoinComponent {
     }
 
     fun testResultFilename(testName: String): String {
+        val arguments = InstrumentationRegistry.getArguments()
+        val d2d = if (arguments.getString("d2d_backup_test") == "true") "d2d" else ""
         val simpleDateFormat = SimpleDateFormat("yyyyMMdd_hhmmss")
         val timeStamp = simpleDateFormat.format(Calendar.getInstance().time)
-        return "${timeStamp}_${testName.replace(" ", "_")}"
+        return "${timeStamp}_${d2d}_${testName.replace(" ", "_")}"
     }
 
     @OptIn(DelicateCoroutinesApi::class)

diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/SeedvaultLargeTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/SeedvaultLargeTest.kt
@@ -16,6 +16,7 @@ import org.junit.rules.TestName
 import org.junit.runner.RunWith
 import org.koin.core.component.KoinComponent
 import java.io.File
+import java.lang.Thread.sleep
 import java.util.concurrent.atomic.AtomicBoolean
 
 @RunWith(AndroidJUnit4::class)
@@ -44,6 +45,11 @@ internal abstract class SeedvaultLargeTest :
         resetApplicationState()
         clearTestBackups()
 
+        runCommand("bmgr enable true")
+        sleep(60000)
+        runCommand("bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport")
+        sleep(60000)
+
         startRecordingTest(keepRecordingScreen, name.methodName)
         restoreBaselineBackup()