CRM-14423 - CiviUnitTestCase - Only run env checks, not security checks, during unit...

The security checks are more I/O intensive.

diff --git a/CRM/Utils/Check.php b/CRM/Utils/Check.php
index 9b13b0db7a87ae444ec29a9f1bc91ddf7deb12a6..288a78f0e9f02846a8008b9b8bb9d07f3b694d0f 100644 (file)
--- a/CRM/Utils/Check.php
+++ b/CRM/Utils/Check.php
@@ -60,8 +60,10 @@ class CRM_Utils_Check {
 
   /**
    * Execute "checkAll"
+   *
+   * @param array|NULL $messages list of CRM_Utils_Check_Message; or NULL if the default list should be fetched
    */
-  public function showPeriodicAlerts() {
+  public function showPeriodicAlerts($messages = NULL) {
     if (CRM_Core_Permission::check('administer CiviCRM')
       && CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'securityAlert', NULL, TRUE)
     ) {
@@ -72,7 +74,10 @@ class CRM_Utils_Check {
         $config = CRM_Core_Config::singleton();
         $config->cleanup(0, FALSE);
 
-        foreach ($this->checkAll() as $message) {
+        if ($messages === NULL) {
+          $messages = $this->checkAll();
+        }
+        foreach ($messages as $message) {
           CRM_Core_Session::setStatus($message->getMessage(), $message->getTitle());
         }
       }
@@ -81,9 +86,13 @@ class CRM_Utils_Check {
 
   /**
    * Throw an exception if any of the checks fail
+   *
+   * @param array|NULL $messages list of CRM_Utils_Check_Message; or NULL if the default list should be fetched
    */
-  public function assertValid() {
-    $messages = $this->checkAll();
+  public function assertValid($messages = NULL) {
+    if ($messages === NULL) {
+      $messages = $this->checkAll();
+    }
     if (!empty($messages)) {
       $messagesAsArray = array();
       foreach ($messages as $message) {

diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 118fde48ce48f3fe66e57d097c1d7c02fd620847..bbbd598235d68cf526b1159171b64afa07f3cc39 100644 (file)
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -307,7 +307,8 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
     // also set this global hack
     $GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
 
-    CRM_Utils_Check::singleton()->assertValid();
+    $env = new CRM_Utils_Check_Env();
+    CRM_Utils_Check::singleton()->assertValid($env->checkAll());
   }
 
   /**