Skip to content

Commit 4b277ca

Browse files
committed
Fix after testing in real app
1 parent 2beb000 commit 4b277ca

3 files changed

Lines changed: 6 additions & 14 deletions

File tree

test_runner/src/main/kotlin/ftl/args/IosArgs.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import ftl.args.ArgsHelper.createGcsBucket
66
import ftl.args.ArgsHelper.createJunitBucket
77
import ftl.args.ArgsHelper.evaluateFilePath
88
import ftl.args.ArgsHelper.mergeYmlMaps
9-
import ftl.args.ArgsHelper.validateTestMethods
109
import ftl.args.ArgsHelper.yamlMapper
1110
import ftl.args.ArgsToString.devicesToString
1211
import ftl.args.ArgsToString.listToString
@@ -65,8 +64,6 @@ class IosArgs(
6564
if (disableSharding) return@lazy listOf(emptyList<String>())
6665

6766
val validTestMethods = Xctestrun.findTestNames(xctestrunFile)
68-
validateTestMethods(testTargets, validTestMethods, "xctest binary")
69-
7067
val testsToShard = filterTests(validTestMethods, testTargets).distinct()
7168

7269
ArgsHelper.calculateShards(testsToShard, this)

test_runner/src/test/kotlin/ftl/args/IosArgsFileTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ class IosArgsFileTest {
7070

7171
val chunk0 = arrayListOf(
7272
"EarlGreyExampleSwiftTests/testWithGreyAssertions",
73-
"EarlGreyExampleSwiftTests/testLayout",
74-
"EarlGreyExampleSwiftTests/testThatThrows",
75-
"EarlGreyExampleSwiftTests/testWithCondition"
73+
"EarlGreyExampleSwiftTests/testWithInRoot",
74+
"EarlGreyExampleSwiftTests/testWithCondition",
75+
"EarlGreyExampleSwiftTests/testWithCustomFailureHandler"
7676
)
7777

7878
val chunk1 = arrayListOf(
7979
"EarlGreyExampleSwiftTests/testWithGreyAssertions",
80-
"EarlGreyExampleSwiftTests/testWithInRoot",
81-
"EarlGreyExampleSwiftTests/testCustomAction"
80+
"EarlGreyExampleSwiftTests/testWithCustomMatcher",
81+
"EarlGreyExampleSwiftTests/testWithCustomAssertion"
8282
)
8383

8484
val testShardChunks = config.testShardChunks

test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ flank:
1515
testShards: 2
1616
repeatTests: 1
1717
test-targets:
18-
- EarlGreyExampleSwiftTests/testWithGreyAssertions
19-
- EarlGreyExampleSwiftTests/testLayout
20-
- EarlGreyExampleSwiftTests/testThatThrows
21-
- EarlGreyExampleSwiftTests/testWithInRoot
22-
- EarlGreyExampleSwiftTests/testCustomAction
23-
- EarlGreyExampleSwiftTests/testWithCondition
18+
- EarlGreyExampleSwiftTests/testWith.*$
2419
test-targets-always-run:
2520
- EarlGreyExampleSwiftTests/testWithGreyAssertions

0 commit comments

Comments
 (0)