Skip to content

Commit de68bc5

Browse files
committed
Update testTimeout to int
1 parent e4661e9 commit de68bc5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/FirebaseTestLabController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ internal class FirebaseTestLabController(
112112
cachedTestMatrixFilter: CachedTestMatrixFilter,
113113
testTargets: List<String>? = null,
114114
flakyTestAttempts: Int = 2,
115-
testTimeout: String = "2700s"
115+
testTimeout: Int = 2700
116116
): List<TestMatrix> {
117117
val devices = (devicePicker ?: defaultDevicePicker).pickDevices()
118118
logger.info {

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestMatrixStore.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ internal class TestMatrixStore(
7272
cachedTestMatrixFilter: CachedTestMatrixFilter = { true },
7373
testTargets: List<String>? = null,
7474
flakyTestAttempts: Int = 2,
75-
testTimeout: String = "2700s"
75+
testTimeout: Int = 2700
7676
): TestMatrix {
7777

7878
val testRunId = TestRun.createId(
@@ -263,7 +263,7 @@ internal class TestMatrixStore(
263263
pullScreenshots: Boolean = false,
264264
testTargets: List<String>? = null,
265265
flakyTestAttempts: Int = 2,
266-
testTimeout: String = "2700s"
266+
testTimeout: Int = 2700
267267
): TestMatrix {
268268
val packageName = firebaseTestLabApi.getApkDetails(
269269
FileReference(
@@ -291,7 +291,7 @@ internal class TestMatrixStore(
291291
)
292292
}
293293
val testSpecification = TestSpecification(
294-
testTimeout = testTimeout,
294+
testTimeout = "${testTimeout}s",
295295
disableVideoRecording = false,
296296
disablePerformanceMetrics = true, // Not a useful feature for androidx
297297
androidInstrumentationTest = AndroidInstrumentationTest(

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestRunnerService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ interface TestRunnerService {
8383
cachedTestMatrixFilter: CachedTestMatrixFilter = { true },
8484
testTargets: List<String>? = null,
8585
flakyTestAttempts: Int = 2,
86-
testTimeout: String = "2700s"
86+
testTimeout: Int = 2700
8787
): ScheduleTestsResponse
8888

8989
/**

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestRunnerServiceImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ internal class TestRunnerServiceImpl internal constructor(
103103
cachedTestMatrixFilter: CachedTestMatrixFilter,
104104
testTargets: List<String>?,
105105
flakyTestAttempts: Int,
106-
testTimeout: String
106+
testTimeout: Int
107107
): TestRunnerService.ScheduleTestsResponse {
108108
val testMatrices = testLabController.submitTests(
109109
appApk = appApk ?: apkStore.getPlaceholderApk(),

0 commit comments

Comments
 (0)