diff --git a/.cirrus.yml b/.cirrus.yml index 533e3df02..aeb05ea36 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -57,3 +57,5 @@ instrumentation_tests_task: adb pull /sdcard/seedvault_test_results screenshots_artifacts: path: "seedvault_test_results/**/*.mp4" + logcat_artifacts: + path: "seedvault_test_results/**/*.log" diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt index 0455b23f2..15093e3db 100644 --- a/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt +++ b/app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt @@ -49,14 +49,14 @@ internal interface LargeTestBase : KoinComponent { companion object { private const val TEST_STORAGE_FOLDER = "seedvault_test" - private const val TEST_VIDEO_FOLDER = "seedvault_test_results" + private const val TEST_RESULT_FOLDER = "seedvault_test_results" } val externalStorageDir: String get() = Environment.getExternalStorageDirectory().absolutePath val testStoragePath get() = "$externalStorageDir/$TEST_STORAGE_FOLDER" - val testVideoPath get() = "$externalStorageDir/$TEST_VIDEO_FOLDER" + val testResultPath get() = "$externalStorageDir/$TEST_RESULT_FOLDER" val targetContext: Context get() = InstrumentationRegistry.getInstrumentation().targetContext @@ -126,7 +126,7 @@ internal interface LargeTestBase : KoinComponent { keepRecordingScreen: AtomicBoolean, testName: String, ) { - val folder = testVideoPath + val folder = testResultPath runCommand("mkdir -p $folder") val fileName = testResultFilename(testName) @@ -152,7 +152,7 @@ internal interface LargeTestBase : KoinComponent { // write logcat to file val fileName = testResultFilename(testName) - runCommand("logcat -d -f $testVideoPath/$fileName.log") + runCommand("logcat -d -f $testResultPath/$fileName.log") } fun uninstallPackages(packages: Collection) { @@ -165,7 +165,7 @@ internal interface LargeTestBase : KoinComponent { fun clearTestBackups() { File(testStoragePath).deleteRecursively() - File(testVideoPath).deleteRecursively() + File(testResultPath).deleteRecursively() } fun changeBackupLocation(