Improve error message on IOS #968
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sloox
requested review from
bootstraponline,
pawelpasterz,
jan-goral,
adamfilipow92 and
piotradamczyk5
release_notes.md
Outdated
| @@ -1,5 +1,6 @@ | |||
| ## next (unreleased) | |||
| - [#952](https://github.com/Flank/flank/pull/952) Fix version printing on Flank release | |||
| - [#937](https://github.com/Flank/flank/pull/968) ([sloox](https://github.com/Sloox)) | |||
There was a problem hiding this comment.
Missing message inside
| @@ -17,6 +18,10 @@ private fun IosArgs.assertMaxTestShards() { this.maxTestShards | |||
| "max-test-shards must be >= ${IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.first} and <= ${IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.last}, or -1. But current is $maxTestShards" | |||
| ) | |||
| } | |||
| private fun IosArgs.assertTestTypes() { | |||
| if(this.xctestrunFile.isNullOrBlank() or this.xctestrunZip.isNullOrBlank()) | |||
There was a problem hiding this comment.
you could skip this
piotradamczyk5
previously approved these changes
Aug 10, 2020
piotradamczyk5
previously approved these changes
Aug 10, 2020
release_notes.md
Outdated
| @@ -1,5 +1,6 @@ | |||
| ## next (unreleased) | |||
| - [#952](https://github.com/Flank/flank/pull/952) Fix version printing on Flank release | |||
| - [#937](https://github.com/Flank/flank/pull/968) Improve error message on IOS when test or xctestrun-file not found ([sloox](https://github.com/Sloox)) | |||
There was a problem hiding this comment.
Suggested change
| - [#937](https://github.com/Flank/flank/pull/968) Improve error message on IOS when test or xctestrun-file not found ([sloox](https://github.com/Sloox)) | |
| - [#937](https://github.com/Flank/flank/pull/968) Improve error message on iOS when test or xctestrun-file not found ([sloox](https://github.com/Sloox)) |
jan-goral
reviewed
Aug 11, 2020
| @@ -62,7 +62,7 @@ IosArgs | |||
| private fun IosArgs.calculateShardChunks() = if (disableSharding) | |||
| listOf(emptyList()) else | |||
| ArgsHelper.calculateShards( | |||
| filteredTests = filterTests(findTestNames(xctestrunFile), testTargets) | |||
| filteredTests = filterTests(findTestNames(xctestrunFile.orEmpty()), testTargets) | |||
There was a problem hiding this comment.
xctestrunFile is not nullable so .orEmpty() is redundant here.
| @@ -17,6 +18,10 @@ private fun IosArgs.assertMaxTestShards() { this.maxTestShards | |||
| "max-test-shards must be >= ${IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.first} and <= ${IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.last}, or -1. But current is $maxTestShards" | |||
| ) | |||
| } | |||
| private fun IosArgs.assertTestTypes() { | |||
| if (xctestrunFile.isNullOrBlank() or xctestrunZip.isNullOrBlank()) | |||
There was a problem hiding this comment.
isBlank() should be enough in both cases
There was a problem hiding this comment.
In this file, we have two logic operator convention now. Look:
private fun IosArgs.assertMaxTestShards() { this.maxTestShards
if (
maxTestShards !in IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE &&
maxTestShards != -1
) throw FlankConfigurationError(
"max-test-shards must be >= ${IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.first} and <= ${IArgs.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE.last}, or -1. But current is $maxTestShards"
)
}
private fun IosArgs.assertTestTypes() {
if (xctestrunFile.isNullOrBlank() or xctestrunZip.isNullOrBlank())
throw FlankConfigurationError("Both of following options must be specified [test, xctestrun-file].")
}
private fun IosArgs.assertXcodeSupported() = when {
xcodeVersion == null -> Unit
IosCatalog.supportedXcode(xcodeVersion, project) -> Unit
else -> throw IncompatibleTestDimensionError(("Xcode $xcodeVersion is not a supported Xcode version"))
}
Maybe we should decide and keep only one?
There was a problem hiding this comment.
👍 @adamfilipow92 we can consider it in another issue. This PR name is Improve error message on IOS not Android
There was a problem hiding this comment.
Right, my mistake. I update my comment to iOS version.
There was a problem hiding this comment.
Shall i create a ticket for this @jan-gogo @adamfilipowicz92 ?
There was a problem hiding this comment.
@Sloox hehe, ofc not if it is only about style convention ;). It is minor for me, you can leave it as-is if you find it readable or fix if you want.
adamfilipow92
approved these changes
Aug 11, 2020
jan-goral
approved these changes
Aug 11, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improve error message on IOS when test or xctestrun-file not found
Fixes #937
Test Plan
Checklist