From 516b5c4b6314476b131c64ed47e7b26365f15871 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Wed, 13 Mar 2019 14:41:24 -0400 Subject: [PATCH] Update to use dash naming on flank yml params FlankYmlParams maxTestShards -> max-test-shards shardTime -> shard-time repeatTests -> repeat-tests smartFlankGcsPath -> smart-flank-gcs-path disableSharding -> disable-sharding --- README.md | 26 +++++++-------- test_runner/flank.ios.yml | 12 +++---- test_runner/flank.yml | 12 +++---- .../src/main/kotlin/ftl/args/AndroidArgs.kt | 10 +++--- .../src/main/kotlin/ftl/args/IosArgs.kt | 10 +++--- .../src/main/kotlin/ftl/args/yml/FlankYml.kt | 22 +++++++++---- .../kotlin/ftl/args/yml/YamlDeprecated.kt | 24 ++++++++++++-- .../test/kotlin/ftl/args/AndroidArgsTest.kt | 30 ++++++++--------- .../src/test/kotlin/ftl/args/FlankYmlTest.kt | 6 ++-- .../src/test/kotlin/ftl/args/IosArgsTest.kt | 32 +++++++++---------- .../kotlin/ftl/args/yml/YamlDeprecatedTest.kt | 19 +++++++++-- .../src/test/kotlin/ftl/doctor/DoctorTest.kt | 8 ++--- .../test/kotlin/ftl/fixtures/flank.gcs.yml | 2 +- .../kotlin/ftl/fixtures/flank.ios.gcs.yml | 2 +- .../test/kotlin/ftl/fixtures/flank.ios.yml | 4 +-- .../test/kotlin/ftl/fixtures/flank.local.yml | 4 +-- .../test/kotlin/ftl/fixtures/flank2.ios.yml | 4 +-- 17 files changed, 136 insertions(+), 91 deletions(-) diff --git a/README.md b/README.md index b0f9c25f11..553464bbb9 100644 --- a/README.md +++ b/README.md @@ -117,25 +117,25 @@ gcloud: flank: # -- FlankYml -- - ## test shards - the maxmimum amount of groups to split the test suite into + ## test shards - the amount of groups to split the test suite into ## set to -1 to use one shard per test. default: 1 - # maxTestShards: 1 + # max-test-shards: 1 ## shard time - the amount of time tests within a shard should take - ## when set to > 0, the shard count is dynamically set based on time up to the maxmimum limit defined by maxTestShards + ## when set to > 0, the shard count is dynamically set based on time up to the maxmimum limit defined by max-test-shards ## 2 minutes (120) is recommended. ## default: -1 (unlimited) - # shardTime: -1 + # shard-time: -1 ## repeat tests - the amount of times to run the tests. ## 1 runs the tests once. 10 runs all the tests 10x - # repeatTests: 1 + # repeat-tests: 1 ## Google cloud storage path to store the JUnit XML results from the last run. - # smartFlankGcsPath: gs://tmp_flank/flank/test_app_ios.xml + # smart-flank-gcs-path: gs://tmp_flank/flank/test_app_ios.xml ## Disables sharding. Useful for parameterized tests. - # disableSharding: false + # disable-sharding: false ## always run - these tests are inserted at the beginning of every shard ## useful if you need to grant permissions or login before other tests run @@ -259,23 +259,23 @@ flank: ## test shards - the amount of groups to split the test suite into ## set to -1 to use one shard per test. default: 1 - # maxTestShards: 1 + # max-test-shards: 1 ## shard time - the amount of time tests within a shard should take - ## when set to > 0, the shard count is dynamically set based on time up to the maxmimum limit defined by maxTestShards + ## when set to > 0, the shard count is dynamically set based on time up to the maxmimum limit defined by max-test-shards ## 2 minutes (120) is recommended. ## default: -1 (unlimited) - # shardTime: -1 + # shard-time: -1 ## repeat tests - the amount of times to run the tests. ## 1 runs the tests once. 10 runs all the tests 10x - # repeatTests: 1 + # repeat-tests: 1 ## Google cloud storage path to store the JUnit XML results from the last run. - # smartFlankGcsPath: gs://tmp_flank/flank/test_app_android.xml + # smart-flank-gcs-path: gs://tmp_flank/flank/test_app_android.xml ## Disables sharding. Useful for parameterized tests. - # disableSharding: false + # disable-sharding: false ## always run - these tests are inserted at the beginning of every shard ## useful if you need to grant permissions or login before other tests run diff --git a/test_runner/flank.ios.yml b/test_runner/flank.ios.yml index 65fb672be6..d55e37b04a 100644 --- a/test_runner/flank.ios.yml +++ b/test_runner/flank.ios.yml @@ -70,23 +70,23 @@ flank: ## test shards - the amount of groups to split the test suite into ## set to -1 to use one shard per test. default: 1 - # maxTestShards: 1 + # max-test-shards: 1 ## shard time - the amount of time tests within a shard should take - ## when set to > 0, the shard count is dynamically set based on time up to the maxmimum limit defined by maxTestShards + ## when set to > 0, the shard count is dynamically set based on time up to the maxmimum limit defined by max-test-shards ## 2 minutes (120) is recommended. ## default: -1 (unlimited) - # shardTime: -1 + # shard-time: -1 ## repeat tests - the amount of times to run the tests. ## 1 runs the tests once. 10 runs all the tests 10x - # repeatTests: 1 + # repeat-tests: 1 ## Google cloud storage path to store the JUnit XML results from the last run. - # smartFlankGcsPath: gs://tmp_flank/flank/test_app_ios.xml + # smart-flank-gcs-path: gs://tmp_flank/flank/test_app_ios.xml ## Disables sharding. Useful for parameterized tests. - # disableSharding: false + # disable-sharding: false ## always run - these tests are inserted at the beginning of every shard ## useful if you need to grant permissions or login before other tests run diff --git a/test_runner/flank.yml b/test_runner/flank.yml index 5a1457d97e..1e58ac42ce 100644 --- a/test_runner/flank.yml +++ b/test_runner/flank.yml @@ -95,23 +95,23 @@ flank: ## test shards - the amount of groups to split the test suite into ## set to -1 to use one shard per test. default: 1 - # maxTestShards: 1 + # max-test-shards: 1 ## shard time - the amount of time tests within a shard should take - ## when set to > 0, the shard count is dynamically set based on time up to the maxmimum limit defined by maxTestShards + ## when set to > 0, the shard count is dynamically set based on time up to the maxmimum limit defined by max-test-shards ## 2 minutes (120) is recommended. ## default: -1 (unlimited) - # shardTime: -1 + # shard-time: -1 ## repeat tests - the amount of times to run the tests. ## 1 runs the tests once. 10 runs all the tests 10x - # repeatTests: 1 + # repeat-tests: 1 ## Google cloud storage path to store the JUnit XML results from the last run. - # smartFlankGcsPath: gs://tmp_flank/flank/test_app_android.xml + # smart-flank-gcs-path: gs://tmp_flank/flank/test_app_android.xml ## Disables sharding. Useful for parameterized tests. - # disableSharding: false + # disable-sharding: false ## always run - these tests are inserted at the beginning of every shard ## useful if you need to grant permissions or login before other tests run diff --git a/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt index bfe2db6a00..cd7096a9a7 100644 --- a/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt +++ b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt @@ -164,15 +164,15 @@ ${devicesToString(devices)} flaky-test-attempts: $flakyTestAttempts flank: - maxTestShards: $maxTestShards - shardTime: $shardTime - repeatTests: $repeatTests - smartFlankGcsPath: $smartFlankGcsPath + max-test-shards: $maxTestShards + shard-time: $shardTime + repeat-tests: $repeatTests + smart-flank-gcs-path: $smartFlankGcsPath files-to-download: ${listToString(filesToDownload)} test-targets-always-run: ${listToString(testTargetsAlwaysRun)} - disableSharding: $disableSharding + disable-sharding: $disableSharding """.trimIndent() } diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt index b0109246b0..2156a72225 100644 --- a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt +++ b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt @@ -120,10 +120,10 @@ ${devicesToString(devices)} flaky-test-attempts: $flakyTestAttempts flank: - maxTestShards: $maxTestShards - shardTime: $shardTime - repeatTests: $repeatTests - smartFlankGcsPath: $smartFlankGcsPath + max-test-shards: $maxTestShards + shard-time: $shardTime + repeat-tests: $repeatTests + smart-flank-gcs-path: $smartFlankGcsPath test-targets-always-run: ${listToString(testTargetsAlwaysRun)} files-to-download: @@ -131,7 +131,7 @@ ${listToString(filesToDownload)} # iOS flank test-targets: ${listToString(testTargets)} - disableSharding: $disableSharding + disable-sharding: $disableSharding """.trimIndent() } diff --git a/test_runner/src/main/kotlin/ftl/args/yml/FlankYml.kt b/test_runner/src/main/kotlin/ftl/args/yml/FlankYml.kt index bd4d4af91c..058c9bb696 100644 --- a/test_runner/src/main/kotlin/ftl/args/yml/FlankYml.kt +++ b/test_runner/src/main/kotlin/ftl/args/yml/FlankYml.kt @@ -8,10 +8,19 @@ import ftl.util.Utils.fatalError /** Flank specific parameters for both iOS and Android */ @JsonIgnoreProperties(ignoreUnknown = true) class FlankYmlParams( + @field:JsonProperty("max-test-shards") val maxTestShards: Int = 1, + + @field:JsonProperty("shard-time") val shardTime: Int = -1, + + @field:JsonProperty("repeat-tests") val repeatTests: Int = 1, + + @field:JsonProperty("smart-flank-gcs-path") val smartFlankGcsPath: String = "", + + @field:JsonProperty("disable-sharding") val disableSharding: Boolean = false, @field:JsonProperty("test-targets-always-run") @@ -22,21 +31,22 @@ class FlankYmlParams( ) { companion object : IYmlKeys { override val keys = listOf( - "maxTestShards", "shardTime", "repeatTests", "smartFlankGcsPath", "disableSharding", "test-targets-always-run", "files-to-download" + "max-test-shards", "shard-time", "repeat-tests", "smart-flank-gcs-path", "disable-sharding", + "test-targets-always-run", "files-to-download" ) } init { - if (maxTestShards <= 0 && maxTestShards != -1) fatalError("maxTestShards must be >= 1 or -1") - if (shardTime <= 0 && shardTime != -1) fatalError("shardTime must be >= 1 or -1") - if (repeatTests < 1) fatalError("repeatTests must be >= 1") + if (maxTestShards <= 0 && maxTestShards != -1) fatalError("max-test-shards must be >= 1 or -1") + if (shardTime <= 0 && shardTime != -1) fatalError("shard-time must be >= 1 or -1") + if (repeatTests < 1) fatalError("repeat-tests must be >= 1") if (smartFlankGcsPath.isNotEmpty()) { if (!smartFlankGcsPath.startsWith(GCS_PREFIX)) { - fatalError("smartFlankGcsPath must start with gs://") + fatalError("smart-flank-gcs-path must start with gs://") } if (smartFlankGcsPath.count { it == '/' } <= 2 || !smartFlankGcsPath.endsWith(".xml")) { - fatalError("smartFlankGcsPath must be in the format gs://bucket/foo.xml") + fatalError("smart-flank-gcs-path must be in the format gs://bucket/foo.xml") } } } diff --git a/test_runner/src/main/kotlin/ftl/args/yml/YamlDeprecated.kt b/test_runner/src/main/kotlin/ftl/args/yml/YamlDeprecated.kt index 5b0e295da4..e4d8da7bab 100644 --- a/test_runner/src/main/kotlin/ftl/args/yml/YamlDeprecated.kt +++ b/test_runner/src/main/kotlin/ftl/args/yml/YamlDeprecated.kt @@ -29,8 +29,28 @@ object YamlDeprecated { private val transforms = listOf( // flank: testShards -> flank: maxTestShards ModifiedKey( - Key(YamlDeprecated.Parent.flank, "testShards"), - Key(YamlDeprecated.Parent.flank, "maxTestShards"), + Key(Parent.flank, "testShards"), + Key(Parent.flank, "max-test-shards"), + Level.Warning + ), + ModifiedKey( + Key(Parent.flank, "shardTime"), + Key(Parent.flank, "shard-time"), + Level.Warning + ), + ModifiedKey( + Key(Parent.flank, "repeatTests"), + Key(Parent.flank, "repeat-tests"), + Level.Warning + ), + ModifiedKey( + Key(Parent.flank, "smartFlankGcsPath"), + Key(Parent.flank, "smart-flank-gcs-path"), + Level.Warning + ), + ModifiedKey( + Key(Parent.flank, "disableSharding"), + Key(Parent.flank, "disable-sharding"), Level.Warning ) ) diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt index 8304aeeb1d..db88e5673d 100644 --- a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt @@ -59,16 +59,16 @@ class AndroidArgsTest { flaky-test-attempts: 3 flank: - maxTestShards: 7 - shardTime: 60 - repeatTests: 8 + max-test-shards: 7 + shard-time: 60 + repeat-tests: 8 files-to-download: - /sdcard/screenshots - /sdcard/screenshots2 test-targets-always-run: - class example.Test#grantPermission - class example.Test#grantPermission2 - disableSharding: true + disable-sharding: true """ @Rule @@ -215,17 +215,17 @@ AndroidArgs flaky-test-attempts: 3 flank: - maxTestShards: 7 - shardTime: 60 - repeatTests: 8 - smartFlankGcsPath:${' '} + max-test-shards: 7 + shard-time: 60 + repeat-tests: 8 + smart-flank-gcs-path:${' '} files-to-download: - /sdcard/screenshots - /sdcard/screenshots2 test-targets-always-run: - class example.Test#grantPermission - class example.Test#grantPermission2 - disableSharding: true + disable-sharding: true """.trimIndent() ) } @@ -278,7 +278,7 @@ AndroidArgs test: $testErrorApk flank: - maxTestShards: -1 + max-test-shards: -1 """ ) @@ -312,7 +312,7 @@ AndroidArgs app: $invalidApk test: $invalidApk flank: - disableSharding: true + disable-sharding: true """ AndroidArgs.load(yaml).testShardChunks } @@ -693,7 +693,7 @@ AndroidArgs test: $testApk flank: - maxTestShards: 2 + max-test-shards: 2 """ assertThat(AndroidArgs.load(yaml).maxTestShards).isEqualTo(2) assertThat(AndroidArgs.load(yaml, cli).maxTestShards).isEqualTo(3) @@ -710,7 +710,7 @@ AndroidArgs test: $testApk flank: - shardTime: 2 + shard-time: 2 """ assertThat(AndroidArgs.load(yaml).shardTime).isEqualTo(2) assertThat(AndroidArgs.load(yaml, cli).shardTime).isEqualTo(3) @@ -727,7 +727,7 @@ AndroidArgs test: $testApk flank: - disableSharding: false + disable-sharding: false """ assertThat(AndroidArgs.load(yaml).disableSharding).isEqualTo(false) assertThat(AndroidArgs.load(yaml, cli).disableSharding).isEqualTo(true) @@ -744,7 +744,7 @@ AndroidArgs test: $testApk flank: - repeatTests: 2 + repeat-tests: 2 """ assertThat(AndroidArgs.load(yaml).repeatTests).isEqualTo(2) assertThat(AndroidArgs.load(yaml, cli).repeatTests).isEqualTo(3) diff --git a/test_runner/src/test/kotlin/ftl/args/FlankYmlTest.kt b/test_runner/src/test/kotlin/ftl/args/FlankYmlTest.kt index 85174e149d..71d5a26f5d 100644 --- a/test_runner/src/test/kotlin/ftl/args/FlankYmlTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/FlankYmlTest.kt @@ -35,19 +35,19 @@ class FlankYmlTest { @Test fun testInvalidTestShards() { - exceptionRule.expectMessage("maxTestShards must be >= 1 or -1") + exceptionRule.expectMessage("max-test-shards must be >= 1 or -1") FlankYml(FlankYmlParams(maxTestShards = -2)) } @Test fun testInvalidShardTime() { - exceptionRule.expectMessage("shardTime must be >= 1 or -1") + exceptionRule.expectMessage("shard-time must be >= 1 or -1") FlankYml(FlankYmlParams(shardTime = -2)) } @Test fun testInvalidrepeatTests() { - exceptionRule.expectMessage("repeatTests must be >= 1") + exceptionRule.expectMessage("repeat-tests must be >= 1") FlankYml(FlankYmlParams(repeatTests = 0)) } } diff --git a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt index c345d5a0f3..dbea2fd4d8 100644 --- a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt @@ -53,9 +53,9 @@ class IosArgsTest { flaky-test-attempts: 4 flank: - maxTestShards: 7 - shardTime: 60 - repeatTests: 8 + max-test-shards: 7 + shard-time: 60 + repeat-tests: 8 files-to-download: - /sdcard/screenshots test-targets-always-run: @@ -64,7 +64,7 @@ class IosArgsTest { test-targets: - b/testBasicSelection - b/testBasicSelection2 - disableSharding: true + disable-sharding: true """ @Rule @@ -164,10 +164,10 @@ IosArgs flaky-test-attempts: 4 flank: - maxTestShards: 7 - shardTime: 60 - repeatTests: 8 - smartFlankGcsPath:${' '} + max-test-shards: 7 + shard-time: 60 + repeat-tests: 8 + smart-flank-gcs-path:${' '} test-targets-always-run: - a/testGrantPermissions - a/testGrantPermissions2 @@ -177,7 +177,7 @@ IosArgs test-targets: - b/testBasicSelection - b/testBasicSelection2 - disableSharding: true + disable-sharding: true """.trimIndent() ) } @@ -228,7 +228,7 @@ IosArgs xctestrun-file: $xctestrunFile flank: - maxTestShards: -1 + max-test-shards: -1 """ ) @@ -264,7 +264,7 @@ IosArgs test: $invalidApp xctestrun-file: $invalidApp flank: - disableSharding: true + disable-sharding: true """ IosArgs.load(yaml).testShardChunks } @@ -276,7 +276,7 @@ IosArgs test: $invalidApp xctestrun-file: $invalidApp flank: - disableSharding: false + disable-sharding: false """ IosArgs.load(yaml).testShardChunks } @@ -399,7 +399,7 @@ IosArgs xctestrun-file: $xctestrunFile flank: - maxTestShards: 2 + max-test-shards: 2 """ assertThat(IosArgs.load(yaml).maxTestShards).isEqualTo(2) assertThat(IosArgs.load(yaml, cli).maxTestShards).isEqualTo(3) @@ -416,7 +416,7 @@ IosArgs xctestrun-file: $xctestrunFile flank: - shardTime: 2 + shard-time: 2 """ assertThat(IosArgs.load(yaml).shardTime).isEqualTo(2) assertThat(IosArgs.load(yaml, cli).shardTime).isEqualTo(3) @@ -433,7 +433,7 @@ IosArgs xctestrun-file: $xctestrunFile flank: - disableSharding: false + disable-sharding: false """ assertThat(IosArgs.load(yaml).disableSharding).isEqualTo(false) assertThat(IosArgs.load(yaml, cli).disableSharding).isEqualTo(true) @@ -450,7 +450,7 @@ IosArgs xctestrun-file: $xctestrunFile flank: - repeatTests: 2 + repeat-tests: 2 """ assertThat(IosArgs.load(yaml).repeatTests).isEqualTo(2) assertThat(IosArgs.load(yaml, cli).repeatTests).isEqualTo(3) diff --git a/test_runner/src/test/kotlin/ftl/args/yml/YamlDeprecatedTest.kt b/test_runner/src/test/kotlin/ftl/args/yml/YamlDeprecatedTest.kt index 9d17fccd3a..7aa288d050 100644 --- a/test_runner/src/test/kotlin/ftl/args/yml/YamlDeprecatedTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/yml/YamlDeprecatedTest.kt @@ -2,12 +2,18 @@ package ftl.args.yml import com.google.common.truth.Truth.assertThat import ftl.test.util.FlankTestRunner +import org.junit.Rule import org.junit.Test +import org.junit.contrib.java.lang.system.SystemOutRule import org.junit.runner.RunWith @RunWith(FlankTestRunner::class) class YamlDeprecatedTest { + @Rule + @JvmField + val systemOutRule: SystemOutRule = SystemOutRule().enableLog().muteForSuccessfulTests() + @Test fun `Valid YAML`() { val input = """ @@ -25,18 +31,27 @@ class YamlDeprecatedTest { } @Test - fun `Flank testShards renamed to maxTestShards`() { + fun `Flank old keys renamed to new keys`() { val input = """ --- flank: testShards: 1 + shardTime: 2 + repeatTests: 3 + smartFlankGcsPath: 4 + disableSharding: 5 + """.trimIndent() val expected = """ --- flank: - maxTestShards: 1 + max-test-shards: 1 + shard-time: 2 + repeat-tests: 3 + smart-flank-gcs-path: 4 + disable-sharding: 5 """.trimIndent() diff --git a/test_runner/src/test/kotlin/ftl/doctor/DoctorTest.kt b/test_runner/src/test/kotlin/ftl/doctor/DoctorTest.kt index ef030a8b21..3753ac09a3 100644 --- a/test_runner/src/test/kotlin/ftl/doctor/DoctorTest.kt +++ b/test_runner/src/test/kotlin/ftl/doctor/DoctorTest.kt @@ -50,8 +50,8 @@ gcloud: two: . flank: - maxTestShards: 7 - repeatTests: 8 + max-test-shards: 7 + repeat-tests: 8 test-targets-always-run: - . three: . @@ -111,8 +111,8 @@ gcloud: two: . flank: - maxTestShards: . - repeatTests: . + max-test-shards: . + repeat-tests: . test-targets-always-run: - . test-targets: diff --git a/test_runner/src/test/kotlin/ftl/fixtures/flank.gcs.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank.gcs.yml index ea6084d5f5..e45f65b36a 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/flank.gcs.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/flank.gcs.yml @@ -27,5 +27,5 @@ gcloud: - /sdcard/screenshots flank: - maxTestShards: 1 + max-test-shards: 1 repeatTests: 1 diff --git a/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.gcs.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.gcs.yml index ec6f6ad017..2df7fa7f3a 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.gcs.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.gcs.yml @@ -17,5 +17,5 @@ gcloud: flank: test-targets: - EarlGreyExampleSwiftTests/testLayout - maxTestShards: 1 + max-test-shards: 1 repeatTests: 1 diff --git a/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.yml index a9d5a03d7a..ec76519adf 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.yml @@ -14,5 +14,5 @@ gcloud: flank: test-targets: - EarlGreyExampleSwiftTests/testLayout - maxTestShards: 1 - repeatTests: 1 + max-test-shards: 1 + repeat-tests: 1 diff --git a/test_runner/src/test/kotlin/ftl/fixtures/flank.local.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank.local.yml index 98bd248154..3a5ea051cd 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/flank.local.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/flank.local.yml @@ -26,5 +26,5 @@ gcloud: - /sdcard/screenshots flank: - maxTestShards: 1 - repeatTests: 1 + max-test-shards: 1 + repeat-tests: 1 diff --git a/test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml index 2f0d2242a8..13920ec138 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml @@ -12,8 +12,8 @@ gcloud: locale: en_US flank: - maxTestShards: 2 - repeatTests: 1 + max-test-shards: 2 + repeat-tests: 1 test-targets: - EarlGreyExampleSwiftTests/testWith.*$ test-targets-always-run: