From dcd7ef66d0e419db4d97f1ebb624ec3c55e1fe4e Mon Sep 17 00:00:00 2001
From: Nathan LeClaire <nathan.leclaire@gmail.com>
Date: Wed, 28 Feb 2018 18:48:52 -0800
Subject: [PATCH] Add support for Go 1.10 (cached) output

Summary:
In Go 1.10 the output for tests was changed to have also a "(cached)" mode in
addition to the normal timing info printed. This is on by default. This adds
support for parsing these lines instead of erroring out on the regex.

Test Plan: Have a unit test included, and will continue to poke at it locally.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19161
---
 .../parser/ArcanistGoTestResultParser.php     |  7 +++++--
 .../ArcanistGoTestResultParserTestCase.php    | 21 +++++++++++++++++++
 .../testresults/go.nonverbose-go1.10          |  2 ++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/unit/parser/__tests__/testresults/go.nonverbose-go1.10

diff --git a/src/unit/parser/ArcanistGoTestResultParser.php b/src/unit/parser/ArcanistGoTestResultParser.php
index ce6451f5..92a9c9ae 100644
--- a/src/unit/parser/ArcanistGoTestResultParser.php
+++ b/src/unit/parser/ArcanistGoTestResultParser.php
@@ -68,7 +68,7 @@ final class ArcanistGoTestResultParser extends ArcanistTestResultParser {
       if (strncmp($line, 'ok', 2) === 0) {
         $meta = array();
         preg_match(
-          '/^ok[\s\t]+(?P<test_name>\w.*)[\s\t]+(?P<time>.*)s.*/',
+          '/^ok[\s]+(?P<test_name>\w.*)[\s]+(?:(?P<time>.*)s|\(cached\))/',
           $line,
           $meta);
 
@@ -84,7 +84,10 @@ final class ArcanistGoTestResultParser extends ArcanistTestResultParser {
           $result = new ArcanistUnitTestResult();
           $result->setName($test_name);
           $result->setResult(ArcanistUnitTestResult::RESULT_PASS);
-          $result->setDuration((float)$meta['time']);
+
+          if (array_key_exists('time', $meta)) {
+            $result->setDuration((float)$meta['time']);
+          }
 
           $results[] = $result;
         } else {
diff --git a/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php b/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
index cf6cf5ed..923787ee 100644
--- a/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
+++ b/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
@@ -103,6 +103,27 @@ final class ArcanistGoTestResultParserTestCase extends PhutilTestCase {
     }
   }
 
+  public function testNonVerboseOutputV110() {
+    $stubbed_results = Filesystem::readFile(
+      dirname(__FILE__).'/testresults/go.nonverbose-go1.10');
+
+    $parsed_results = id(new ArcanistGoTestResultParser())
+      ->parseTestResults('package', $stubbed_results);
+
+    $this->assertEqual(2, count($parsed_results));
+    $this->assertEqual(
+      'Go::TestCase::package::subpackage1',
+      $parsed_results[0]->getName());
+    $this->assertEqual(
+      'Go::TestCase::package::subpackage2',
+      $parsed_results[1]->getName());
+    foreach ($parsed_results as $result) {
+      $this->assertEqual(
+        ArcanistUnitTestResult::RESULT_PASS,
+        $result->getResult());
+    }
+  }
+
   public function testSingleTestCaseSuccessfulGo14() {
     $stubbed_results = Filesystem::readFile(
       dirname(__FILE__).'/testresults/go.single-test-case-successful-go1.4');
diff --git a/src/unit/parser/__tests__/testresults/go.nonverbose-go1.10 b/src/unit/parser/__tests__/testresults/go.nonverbose-go1.10
new file mode 100644
index 00000000..e23664cb
--- /dev/null
+++ b/src/unit/parser/__tests__/testresults/go.nonverbose-go1.10
@@ -0,0 +1,2 @@
+ok  	package/subpackage1	(cached)
+ok  	package/subpackage2	0.010s