From 17400acec388582dbf571759f6ccf3cd53ae799d Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 26 Jul 2013 19:03:31 -0700 Subject: [PATCH] CiviUnitTestCase::callAPIAndDocument - Don't retry failed API calls --- tests/phpunit/CiviTest/CiviUnitTestCase.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) 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; -- 2.25.1