Merge branch 'develop' into stable

google · Apr 27, 2016 · c792fff · c792fff
2 parents cc0f633 + 2d3c03f
commit c792fff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.0.1
+
+* If tests fail to build we no longer generate a
+  `Unhandled Exception ("PhutilTypeMissingParametersException")` exception on Phabricator. We were
+  not previously providing a name to the ArcanistUnitTestResult instance.
+
 ## 3.0.0
 
 * Commands now always run from the root directory of the project rather than from the shell's

diff --git a/engine/XcodeUnitTestEngine.php b/engine/XcodeUnitTestEngine.php
@@ -132,6 +132,7 @@ public function run() {
     // Error-code 65 is thrown for build/unit test failures.
     if ($builderror !== 0 && $builderror !== 65) {
       return array(id(new ArcanistUnitTestResult())
+        ->setName("Xcode test engine")
         ->setUserData($this->stderr)
         ->setResult(ArcanistUnitTestResult::RESULT_BROKEN));
     }

diff --git a/parser/XcodeTestResultParser.php b/parser/XcodeTestResultParser.php
@@ -37,7 +37,7 @@ public function setXcodeArgs($args) {
   public function parseTestResults($path, $test_results) {
     if (!$test_results) {
       $result = id(new ArcanistUnitTestResult())
-        ->setName($path)
+        ->setName("Xcode test engine")
         ->setUserData($this->stderr)
         ->setResult(ArcanistUnitTestResult::RESULT_BROKEN);
       return array($result);