Update testTimeout to int

androidx · Sep 16, 2024 · de68bc5 · de68bc5
1 parent e4661e9
commit de68bc5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/FirebaseTestLabController.kt b/AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/FirebaseTestLabController.kt
@@ -112,7 +112,7 @@ internal class FirebaseTestLabController(
         cachedTestMatrixFilter: CachedTestMatrixFilter,
         testTargets: List<String>? = null,
         flakyTestAttempts: Int = 2,
-        testTimeout: String = "2700s"
+        testTimeout: Int = 2700
     ): List<TestMatrix> {
         val devices = (devicePicker ?: defaultDevicePicker).pickDevices()
         logger.info {

diff --git a/AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestMatrixStore.kt b/AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestMatrixStore.kt
@@ -72,7 +72,7 @@ internal class TestMatrixStore(
         cachedTestMatrixFilter: CachedTestMatrixFilter = { true },
         testTargets: List<String>? = null,
         flakyTestAttempts: Int = 2,
-        testTimeout: String = "2700s"
+        testTimeout: Int = 2700
     ): TestMatrix {
 
         val testRunId = TestRun.createId(
@@ -263,7 +263,7 @@ internal class TestMatrixStore(
         pullScreenshots: Boolean = false,
         testTargets: List<String>? = null,
         flakyTestAttempts: Int = 2,
-        testTimeout: String = "2700s"
+        testTimeout: Int = 2700
     ): TestMatrix {
         val packageName = firebaseTestLabApi.getApkDetails(
             FileReference(
@@ -291,7 +291,7 @@ internal class TestMatrixStore(
             )
         }
         val testSpecification = TestSpecification(
-            testTimeout = testTimeout,
+            testTimeout = "${testTimeout}s",
             disableVideoRecording = false,
             disablePerformanceMetrics = true, // Not a useful feature for androidx
             androidInstrumentationTest = AndroidInstrumentationTest(

diff --git a/AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestRunnerService.kt b/AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestRunnerService.kt
@@ -83,7 +83,7 @@ interface TestRunnerService {
         cachedTestMatrixFilter: CachedTestMatrixFilter = { true },
         testTargets: List<String>? = null,
         flakyTestAttempts: Int = 2,
-        testTimeout: String = "2700s"
+        testTimeout: Int = 2700
     ): ScheduleTestsResponse
 
     /**

diff --git a/AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestRunnerServiceImpl.kt b/AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestRunnerServiceImpl.kt
@@ -103,7 +103,7 @@ internal class TestRunnerServiceImpl internal constructor(
         cachedTestMatrixFilter: CachedTestMatrixFilter,
         testTargets: List<String>?,
         flakyTestAttempts: Int,
-        testTimeout: String
+        testTimeout: Int
     ): TestRunnerService.ScheduleTestsResponse {
         val testMatrices = testLabController.submitTests(
             appApk = appApk ?: apkStore.getPlaceholderApk(),