Update uploadJunitXml

Flank · Nov 16, 2018 · beb95a8 · beb95a8
1 parent bb2ac62
commit beb95a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/gc/GcStorage.kt b/test_runner/src/main/kotlin/ftl/gc/GcStorage.kt
@@ -9,6 +9,8 @@ import ftl.args.IArgs
 import ftl.args.IosArgs
 import ftl.config.FtlConstants
 import ftl.config.FtlConstants.GCS_PREFIX
+import ftl.reports.xml.model.JUnitTestResult
+import ftl.reports.xml.xmlToString
 import ftl.util.Utils.fatalError
 import ftl.util.Utils.join
 import java.io.File
@@ -41,7 +43,7 @@ object GcStorage {
             runGcsPath = runGcsPath
         )
 
-    fun uploadJunitXml(xmlData: String, args: IArgs) {
+    fun uploadJunitXml(testResult: JUnitTestResult, args: IArgs) {
         if (args.junitGcsPath.isEmpty()) return
 
         // bucket/path/to/object
@@ -52,7 +54,7 @@ object GcStorage {
         val fileBlob = BlobInfo.newBuilder(bucket, name).build()
 
         try {
-            storage.create(fileBlob, xmlData.toByteArray())
+            storage.create(fileBlob, testResult.xmlToString().toByteArray())
         } catch (e: Exception) {
             fatalError(e)
         }

diff --git a/test_runner/src/main/kotlin/ftl/reports/util/ReportManager.kt b/test_runner/src/main/kotlin/ftl/reports/util/ReportManager.kt
@@ -105,6 +105,6 @@ object ReportManager {
 
         newTestResult.mergeTestTimes(oldTestResult)
 
-        GcStorage.uploadJunitXml(newTestResult.xmlToString(), args)
+        GcStorage.uploadJunitXml(newTestResult, args)
     }
 }