update integration tests

Flank · Dec 29, 2020 · 205dddd · 205dddd
1 parent 23dd3ce
commit 205dddd
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/integration_tests/build.gradle.kts b/integration_tests/build.gradle.kts
@@ -17,6 +17,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib"))
+    implementation(project(":common"))
     testImplementation(Dependencies.JUNIT)
     testImplementation(Dependencies.JACKSON_XML)
     testImplementation(Dependencies.JACKSON_KOTLIN)

diff --git a/integration_tests/src/test/kotlin/integration/AllTestFilteredIT.kt b/integration_tests/src/test/kotlin/integration/AllTestFilteredIT.kt
@@ -2,6 +2,7 @@ package integration
 
 import FlankCommand
 import com.google.common.truth.Truth.assertThat
+import flank.common.isWindows
 import org.junit.Assume.assumeFalse
 import org.junit.Test
 import run

diff --git a/integration_tests/src/test/kotlin/integration/IntergrationTestsUtils.kt b/integration_tests/src/test/kotlin/integration/IntergrationTestsUtils.kt
@@ -1,6 +1,7 @@
 package integration
 
 import com.google.common.truth.Truth.assertThat
+import flank.common.isWindows
 import org.junit.Assert.assertEquals
 import utils.ProcessResult
 import java.io.File
@@ -93,8 +94,3 @@ fun String.removeUnicode() = replace("\u001B\\[\\d{1,2}m".toRegex(), "").trimInd
 
 fun findInCompare(name: String) = File("./src/test/resources/compare/$name-compare").readText().trimIndent()
 
-private val osName = System.getProperty("os.name")?.toLowerCase() ?: ""
-
-val isWindows: Boolean by lazy {
-    osName.indexOf("win") >= 0
-}
diff --git a/integration_tests/src/test/resources/compare/GameloopIT-android-compare b/integration_tests/src/test/resources/compare/GameloopIT-android-compare
@@ -64,12 +64,13 @@ AndroidArgs
       default-class-test-time: 240.0
 \s*
 RunTests
-  Uploading test.obb \.*
-  Uploading app-debug.apk \.*
+  Uploading \[test.obb\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
+  Uploading \[app-debug.apk\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
+\s*
   0 test \/ 0 shard
 \s*
   1 matrix ids created in \d{1,2}m \d{1,2}s
-  https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9-]*\/[.a-zA-Z0-9_-]*
+  Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9-]*\/[.a-zA-Z0-9_-]*\]
 \s*
 Matrices webLink
   matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)?
@@ -78,16 +79,16 @@ CostReport
   Virtual devices
     \$\d{1,2}.\d{1,2} for \d{1,2}m
 
-  Uploading CostReport.txt \.*
+  Uploading \[CostReport.txt\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
+\s*
 MatrixResultsReport
   1 \/ 1 \(100\.00\%\)
 [\s\S]*
-  Uploading MatrixResultsReport.txt \.*
-  Uploading JUnitReport.xml \.*
-  Uploading matrix_ids.json \.*
+  Uploading \[MatrixResultsReport.txt\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
+  Uploading \[JUnitReport.xml\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
+  Uploading \[matrix_ids.json\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
 FetchArtifacts
-  \.*
-  Updating matrix file
+    Updating matrix file
 \s*
 Matrices webLink
   matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)?
diff --git a/integration_tests/src/test/resources/compare/GameloopIT-ios-compare b/integration_tests/src/test/resources/compare/GameloopIT-ios-compare
@@ -52,11 +52,13 @@ IosArgs
       default-class-test-time: 240.0
 
 RunTests
+\s*
   0 test \/ 0 shard
 
-  Uploading FlankGameLoopExample.ipa .
+  Uploading \[FlankGameLoopExample.ipa\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
+
   1 matrix ids created in \d{1,2}m \d{1,2}s
-  https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*
+  Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\]
 
 Matrices webLink
   matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)?
@@ -68,20 +70,20 @@ CostReport
   Physical devices
     \$\d{1,2}.\d{1,2} for \d{1,2}m
 
-  Uploading CostReport.txt .
+  Uploading \[CostReport.txt\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
+
 MatrixResultsReport
   1 \/ 1 \(100.00%\)
 ┌─────────┬──────────────────────┬──────────────────────────────┬─────────────────────┐
 │ OUTCOME │      MATRIX ID       │       TEST AXIS VALUE        │    TEST DETAILS     │
 ├─────────┼──────────────────────┼──────────────────────────────┼─────────────────────┤
 │ success │ matrix-[a-zA-Z0-9]* │.* │ 0 test cases passed │
 └─────────┴──────────────────────┴──────────────────────────────┴─────────────────────┘
-  Uploading MatrixResultsReport.txt .
-  Uploading matrix_ids.json .
-FetchArtifacts
-  .
-  Updating matrix file
+  Uploading \[MatrixResultsReport.txt\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
+  Uploading \[matrix_ids.json\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
 
+FetchArtifacts
+    Updating matrix file
 
 Matrices webLink
   matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)?
diff --git a/test_runner/src/main/kotlin/ftl/run/NewTestRun.kt b/test_runner/src/main/kotlin/ftl/run/NewTestRun.kt
@@ -29,7 +29,6 @@ suspend fun IArgs.newTestRun() = withTimeoutOrNull(parsedTimeout) {
         ReportManager.generate(matrixMap, args, testShardChunks, ignoredTests)
         cancelTestsOnTimeout(args.project, matrixMap.map) { fetchArtifacts(matrixMap, args) }
 
-        logLn()
         matrixMap.printMatricesWebLinks(project)
 
         matrixMap.validate(ignoreFailedTests)