CRM-17860 - CiviTestListener - Fix bootstrap for end-to-end tests.

diff --git a/Civi/Test/CiviTestListener.php b/Civi/Test/CiviTestListener.php
index 8dff35b3f2f157aaed9a377661c6e51f058af66f..3bd6f0dbc5d2e658afa87102e55e19c019cbb476 100644 (file)
--- a/Civi/Test/CiviTestListener.php
+++ b/Civi/Test/CiviTestListener.php
@@ -86,7 +86,7 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
    */
   protected function bootHeadless($test) {
     if (CIVICRM_UF !== 'UnitTests') {
-      throw new \RuntimeException('CiviHeadlessTestInterface requires CIVICRM_UF=UnitTests');
+      throw new \RuntimeException('HeadlessInterface requires CIVICRM_UF=UnitTests');
     }
 
     // Hrm, this seems wrong. Shouldn't we be resetting the entire session?
@@ -168,11 +168,11 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
     }
     elseif (!empty($byInterface['HeadlessInterface'])) {
       putenv('CIVICRM_UF=UnitTests');
-      eval($this->cv('php:boot --level=settings', 'phpcode'));
+      eval($this->cv('php:boot --level=full', 'phpcode'));
     }
     elseif (!empty($byInterface['EndToEndInterface'])) {
       putenv('CIVICRM_UF=');
-      eval($this->cv('php:boot --level=settings', 'phpcode'));
+      eval($this->cv('php:boot --level=full', 'phpcode'));
     }
 
     $blurb = "Tip: Run the headless tests and end-to-end tests separately, e.g.\n"