Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Adds check for .aab format before querying apkDetails #2189

Merged
merged 3 commits into from
Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
8 changes: 6 additions & 2 deletions test_runner/src/main/kotlin/ftl/client/google/AppDetails.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ package ftl.client.google
import com.google.testing.model.FileReference
import ftl.http.executeWithRetry

fun getAndroidAppDetails(gcsAppPath: String): String =
GcTesting.get
fun getAndroidAppDetails(gcsAppPath: String): String {
// getApkDetails errors when sent non-apk files such as aab
if (gcsAppPath.trim().lowercase().endsWith(".apk").not()) return ""

return GcTesting.get
.ApplicationDetailService()
.getApkDetails(FileReference().apply { gcsPath = gcsAppPath })
.apply { requestHeaders.set("X-Server-Timeout", 1800) } // 30 min
.executeWithRetry()
?.apkDetail?.apkManifest?.packageName?.toString().orEmpty()
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ internal suspend fun AndroidArgs.runAndroidTests(): TestResult = coroutineScope
ignoredTestsShardChunks += context.ignoredTestCases
allTestShardChunks += context.shards
}

context.reportPackageName()
}
.map { createTestSetup(it) }
Expand Down
28 changes: 28 additions & 0 deletions test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ftl.args

import com.google.common.truth.Truth.assertThat
import com.google.testing.model.TestSpecification
import flank.tool.analytics.mixpanel.Mixpanel
import ftl.args.IArgs.Companion.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE
import ftl.args.IArgs.Companion.AVAILABLE_VIRTUAL_SHARD_COUNT_RANGE
import ftl.args.yml.AppTestPair
Expand Down Expand Up @@ -31,10 +32,13 @@ import ftl.test.util.TestHelper.getPath
import ftl.test.util.TestHelper.getThrowable
import ftl.test.util.assertThrowsWithMessage
import ftl.util.asFileReference
import ftl.util.getMockedTestMatrix
import ftl.util.mockTestMatrices
import io.mockk.every
import io.mockk.mockkObject
import io.mockk.mockkStatic
import io.mockk.unmockkAll
import io.mockk.verify
import kotlinx.coroutines.runBlocking
import org.junit.After
import org.junit.Assert.assertEquals
Expand Down Expand Up @@ -62,6 +66,7 @@ class AndroidArgsTest {

private val empty = emptyList<String>()
private val appApk = "../test_projects/android/apks/app-debug.apk"
private val appAab = "../test_projects/android/bundle/app-debug.aab"
private val invalidApk = "../test_projects/android/apks/invalid.apk"
private val nonExistingApk = "../test_projects/android/apks/app-debug_non_existing.apk"
private val testApk = "../test_projects/android/apks/app-debug-androidTest.apk"
Expand Down Expand Up @@ -1717,6 +1722,29 @@ AndroidArgs
}
}

@Test
fun `should send no package name to mixpanel for aab format`() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for adding a test!

val yaml = """
gcloud:
app: $appAab
test: $testApk
""".trimIndent()

val parsedYml = AndroidArgs.load(yaml).validate()

mockTestMatrices(
getMockedTestMatrix().apply { state = "RUNNING" },
getMockedTestMatrix().apply { state = "RUNNING" },
getMockedTestMatrix()
)

mockkObject(Mixpanel)

runBlocking { parsedYml.runAndroidTests() }

verify { Mixpanel.add(Mixpanel.APP_ID, "") }
}

@Test
fun `results-dir (cloud directory) should not throw if it doesn't exist locally`() {
val resultsDir = UUID.randomUUID().toString()
Expand Down
25 changes: 3 additions & 22 deletions test_runner/src/test/kotlin/ftl/run/TestRunnerTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ package ftl.run

import com.google.common.truth.Truth.assertThat
import com.google.testing.Testing
import com.google.testing.model.GoogleCloudStorage
import com.google.testing.model.ResultStorage
import com.google.testing.model.TestExecution
import com.google.testing.model.TestMatrix
import flank.common.isWindows
import ftl.adapter.google.getFilePathToDownload
import ftl.api.Artifacts.DownloadPath
Expand All @@ -15,6 +11,8 @@ import ftl.client.google.getAndroidAppDetails
import ftl.http.executeWithRetry
import ftl.test.util.FlankTestRunner
import ftl.test.util.LocalGcs
import ftl.util.getMockedTestMatrix
import ftl.util.mockTestMatrices
import io.mockk.every
import io.mockk.mockkStatic
import io.mockk.unmockkAll
Expand Down Expand Up @@ -155,10 +153,7 @@ class TestRunnerTest {
@Test
fun `flank should stop updating web link if matrix has invalid state`() {
val localConfig = AndroidArgs.load(Paths.get("src/test/kotlin/ftl/fixtures/flank.local.yml"))
mockkStatic("ftl.http.ExecuteWithRetryKt")
every {
any<Testing.Projects.TestMatrices.Get>().executeWithRetry()
} returnsMany listOf(
mockTestMatrices(
getMockedTestMatrix().apply { state = "RUNNING" },
getMockedTestMatrix().apply { state = "RUNNING" },
getMockedTestMatrix()
Expand All @@ -180,18 +175,4 @@ class TestRunnerTest {
assertFalse(output.contains(matrixLink))
verify(exactly = 3) { any<Testing.Projects.TestMatrices.Get>().executeWithRetry() }
}

private fun getMockedTestMatrix() = TestMatrix().apply {
state = "INVALID"
testMatrixId = "matrix-12345"
testExecutions = listOf(
TestExecution().apply {
resultStorage = ResultStorage().apply {
googleCloudStorage = GoogleCloudStorage().apply {
gcsPath = "any/Path"
}
}
}
)
}
}
33 changes: 33 additions & 0 deletions test_runner/src/test/kotlin/ftl/util/MatricesMocks.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package ftl.util

import com.google.testing.Testing
import com.google.testing.model.GoogleCloudStorage
import com.google.testing.model.ResultStorage
import com.google.testing.model.TestExecution
import com.google.testing.model.TestMatrix
import ftl.http.executeWithRetry
import io.mockk.every
import io.mockk.mockkStatic

fun mockTestMatrices(
vararg mocks: TestMatrix
) {
mockkStatic("ftl.http.ExecuteWithRetryKt")
every {
any<Testing.Projects.TestMatrices.Get>().executeWithRetry()
} returnsMany listOf(*mocks)
}

fun getMockedTestMatrix() = TestMatrix().apply {
state = "INVALID"
testMatrixId = "matrix-12345"
testExecutions = listOf(
TestExecution().apply {
resultStorage = ResultStorage().apply {
googleCloudStorage = GoogleCloudStorage().apply {
gcsPath = "any/Path"
}
}
}
)
}