Fix after testing in real app

Flank · Jan 27, 2019 · 4b277ca · 4b277ca
1 parent 2beb000
commit 4b277ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt
@@ -6,7 +6,6 @@ import ftl.args.ArgsHelper.createGcsBucket
 import ftl.args.ArgsHelper.createJunitBucket
 import ftl.args.ArgsHelper.evaluateFilePath
 import ftl.args.ArgsHelper.mergeYmlMaps
-import ftl.args.ArgsHelper.validateTestMethods
 import ftl.args.ArgsHelper.yamlMapper
 import ftl.args.ArgsToString.devicesToString
 import ftl.args.ArgsToString.listToString
@@ -65,8 +64,6 @@ class IosArgs(
         if (disableSharding) return@lazy listOf(emptyList<String>())
 
         val validTestMethods = Xctestrun.findTestNames(xctestrunFile)
-        validateTestMethods(testTargets, validTestMethods, "xctest binary")
-
         val testsToShard = filterTests(validTestMethods, testTargets).distinct()
 
         ArgsHelper.calculateShards(testsToShard, this)

diff --git a/test_runner/src/test/kotlin/ftl/args/IosArgsFileTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsFileTest.kt
@@ -70,15 +70,15 @@ class IosArgsFileTest {
 
         val chunk0 = arrayListOf(
             "EarlGreyExampleSwiftTests/testWithGreyAssertions",
-            "EarlGreyExampleSwiftTests/testLayout",
-            "EarlGreyExampleSwiftTests/testThatThrows",
-            "EarlGreyExampleSwiftTests/testWithCondition"
+            "EarlGreyExampleSwiftTests/testWithInRoot",
+            "EarlGreyExampleSwiftTests/testWithCondition",
+            "EarlGreyExampleSwiftTests/testWithCustomFailureHandler"
         )
 
         val chunk1 = arrayListOf(
             "EarlGreyExampleSwiftTests/testWithGreyAssertions",
-            "EarlGreyExampleSwiftTests/testWithInRoot",
-            "EarlGreyExampleSwiftTests/testCustomAction"
+            "EarlGreyExampleSwiftTests/testWithCustomMatcher",
+            "EarlGreyExampleSwiftTests/testWithCustomAssertion"
         )
 
         val testShardChunks = config.testShardChunks

diff --git a/test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml
@@ -15,11 +15,6 @@ flank:
   testShards: 2
   repeatTests: 1
   test-targets:
-    - EarlGreyExampleSwiftTests/testWithGreyAssertions
-    - EarlGreyExampleSwiftTests/testLayout
-    - EarlGreyExampleSwiftTests/testThatThrows
-    - EarlGreyExampleSwiftTests/testWithInRoot
-    - EarlGreyExampleSwiftTests/testCustomAction
-    - EarlGreyExampleSwiftTests/testWithCondition
+    - EarlGreyExampleSwiftTests/testWith.*$
   test-targets-always-run:
   - EarlGreyExampleSwiftTests/testWithGreyAssertions