From 461847659702ae26c7e64956757659a07cbeeef5 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 2 Jun 2020 15:12:21 +0200 Subject: [PATCH] Change messages on fast fail and change function fixMaxTestShardsValue name to convertToShardCount --- test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt | 2 +- test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt | 2 +- test_runner/src/main/kotlin/ftl/args/IArgs.kt | 2 +- test_runner/src/main/kotlin/ftl/args/IosArgs.kt | 2 +- test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt index 10ba089aef..2c037a3520 100644 --- a/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt +++ b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt @@ -78,7 +78,7 @@ class AndroidArgs( val devices = cli?.device ?: androidGcloud.device private val flank = flankYml.flank - override val maxTestShards = fixMaxTestShardsValue(cli?.maxTestShards ?: flank.maxTestShards) + override val maxTestShards = convertToShardCount(cli?.maxTestShards ?: flank.maxTestShards) override val shardTime = cli?.shardTime ?: flank.shardTime override val repeatTests = cli?.repeatTests ?: flank.repeatTests override val smartFlankGcsPath = cli?.smartFlankGcsPath ?: flank.smartFlankGcsPath diff --git a/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt b/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt index b3ba955b61..d3163a4d57 100644 --- a/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt +++ b/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt @@ -66,7 +66,7 @@ object ArgsHelper { ) if (args.maxTestShards !in AVAILABLE_SHARD_COUNT_RANGE && args.maxTestShards != -1) - throw FlankFatalError("max-test-shards must be >= ${AVAILABLE_SHARD_COUNT_RANGE.first} and <= ${AVAILABLE_SHARD_COUNT_RANGE.last}, or -1. But current is ${args.maxTestShards}") + throw FlankFatalError("max-test-shards must be >= ${AVAILABLE_SHARD_COUNT_RANGE.first} and <= ${AVAILABLE_SHARD_COUNT_RANGE.last}. But current is ${args.maxTestShards}") if (args.shardTime <= 0 && args.shardTime != -1) throw FlankFatalError("shard-time must be >= 1 or -1") if (args.repeatTests < 1) throw FlankFatalError("num-test-runs must be >= 1") diff --git a/test_runner/src/main/kotlin/ftl/args/IArgs.kt b/test_runner/src/main/kotlin/ftl/args/IArgs.kt index 1dd1050574..0bd8a3a732 100644 --- a/test_runner/src/main/kotlin/ftl/args/IArgs.kt +++ b/test_runner/src/main/kotlin/ftl/args/IArgs.kt @@ -51,7 +51,7 @@ interface IArgs { fun useLocalResultDir() = localResultDir != FlankYmlParams.defaultLocalResultsDir - fun fixMaxTestShardsValue(inputValue: Int): Int = if (inputValue == -1) { + fun convertToShardCount(inputValue: Int): Int = if (inputValue == -1) { AVAILABLE_SHARD_COUNT_RANGE.last } else { inputValue diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt index 7eade47916..8d87d34597 100644 --- a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt +++ b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt @@ -56,7 +56,7 @@ class IosArgs( val devices = cli?.device ?: iosGcloud.device private val flank = flankYml.flank - override val maxTestShards = fixMaxTestShardsValue(cli?.maxTestShards ?: flank.maxTestShards) + override val maxTestShards = convertToShardCount(cli?.maxTestShards ?: flank.maxTestShards) override val shardTime = cli?.shardTime ?: flank.shardTime override val repeatTests = cli?.repeatTests ?: flank.repeatTests override val smartFlankGcsPath = cli?.smartFlankGcsPath ?: flank.smartFlankGcsPath diff --git a/test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt b/test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt index 5d0eba31d9..6585d9a1e2 100644 --- a/test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/ArgsHelperTest.kt @@ -189,7 +189,7 @@ class ArgsHelperTest { @Test fun testInvalidTestShards() { val maxTestShards = -2 - exceptionRule.expectMessage("max-test-shards must be >= ${IArgs.AVAILABLE_SHARD_COUNT_RANGE.first} and <= ${IArgs.AVAILABLE_SHARD_COUNT_RANGE.last}, or -1. But current is $maxTestShards") + exceptionRule.expectMessage("max-test-shards must be >= ${IArgs.AVAILABLE_SHARD_COUNT_RANGE.first} and <= ${IArgs.AVAILABLE_SHARD_COUNT_RANGE.last}. But current is $maxTestShards") val args = spyk(AndroidArgs.default()) every { args.maxTestShards } returns maxTestShards