From: Tim Otten <totten@civicrm.org>
Date: Sat, 27 Jul 2013 02:03:31 +0000 (-0700)
Subject: CiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=17400acec388582dbf571759f6ccf3cd53ae799d;p=civicrm-core.git

CiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls
---

diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index bb4e2ccaec..3ce70e86bb 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -803,18 +803,9 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
    */
   function callAPIAndDocument($entity, $action, $params, $function, $file, $description = "", $subfile = NULL, $actionName = NULL){
     $params['version'] = $this->_apiversion;
-    if(!isset($params['debug'])){
-      // don't debug by default to keep examples tidy
-      $params['debug'] = 0;
-    }
-    try{
-      $result = $this->callAPISuccess($entity, $action, $params);
-    }
-    catch (EXCEPTION $e) {
-      // but if it fails call again with debug on for better error message
-      $params['debug'] = 1;
-      $result = $this->callAPISuccess($entity, $action, $params);
-
+    $result = $this->callAPISuccess($entity, $action, $params);
+    if (is_array($result)) {
+      unset($result['xdebug']);
     }
     $this->documentMe($params, $result, $function, $file, $description, $subfile, $actionName);
     return $result;