diff --git a/test_runner/src/main/kotlin/ftl/ios/IosCatalog.kt b/test_runner/src/main/kotlin/ftl/ios/IosCatalog.kt index 4348d40171..75dd3cf261 100644 --- a/test_runner/src/main/kotlin/ftl/ios/IosCatalog.kt +++ b/test_runner/src/main/kotlin/ftl/ios/IosCatalog.kt @@ -26,7 +26,8 @@ object IosCatalog { fun softwareVersionsAsTable(projectId: String) = getVersionsList(projectId).asPrintableTable() - fun describeSoftwareVersion(projectId: String, versionId: String) = getVersionsList(projectId).getDescription(versionId) + fun describeSoftwareVersion(projectId: String, versionId: String) = + getVersionsList(projectId).getDescription(versionId) private fun getVersionsList(projectId: String) = iosDeviceCatalog(projectId).versions @@ -36,7 +37,8 @@ object IosCatalog { private fun getLocales(projectId: String) = iosDeviceCatalog(projectId).runtimeConfiguration.locales - fun supportedOrientationsAsTable(projectId: String) = iosDeviceCatalog(projectId).runtimeConfiguration.orientations.asPrintableTable() + fun supportedOrientationsAsTable(projectId: String) = + iosDeviceCatalog(projectId).runtimeConfiguration.orientations.asPrintableTable() fun supportedXcode(version: String, projectId: String) = xcodeVersions(projectId).contains(version) @@ -71,8 +73,7 @@ If this project has already been granted access, please make sure you are using on the Blaze or Flame billing plans, and that you have run gcloud config set billing/quota_project project -If you are still having issues, please email ftl-ios-feedback@google.com for support.""", - e +If you are still having issues, please email ftl-ios-feedback@google.com for support.""", e ) } } diff --git a/test_runner/src/main/kotlin/ftl/reports/api/PrepareForJUnitResult.kt b/test_runner/src/main/kotlin/ftl/reports/api/PrepareForJUnitResult.kt index 2e3c2d5694..615538e13e 100644 --- a/test_runner/src/main/kotlin/ftl/reports/api/PrepareForJUnitResult.kt +++ b/test_runner/src/main/kotlin/ftl/reports/api/PrepareForJUnitResult.kt @@ -39,13 +39,15 @@ private fun TestExecutionData.reduceTestCases() = copy( } ) -internal fun List.removeStackTraces(): List = map(TestExecutionData::removeStackTraces) +internal fun List.removeStackTraces(): List = + map(TestExecutionData::removeStackTraces) + private fun TestExecutionData.removeStackTraces() = copy( testCases = testCases.onEach { if (it.flaky) { -it.stackTraces = emptyList() -} -} + it.stackTraces = emptyList() + } + } ) // For primary step return stepId instead of primaryStepId diff --git a/test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt b/test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt index c687fc2e8a..d47a59c31d 100644 --- a/test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt @@ -50,11 +50,11 @@ class ArgsHelperTest { val merged = mergeYmlKeys( mockk() { every { keys } returns listOf("devices", "test", "apk") -every { group } returns "gcloud" + every { group } returns "gcloud" }, mockk() { every { keys } returns listOf("xcode-version", "async", "client-details") - every { group } returns "gcloud" + every { group } returns "gcloud" } )