Merge pull request #12011 from lcdservices/dev-financial-12

[civicrm-core.git] / Civi / Test / CiviTestListener.php

diff --git a/Civi/Test/CiviTestListener.php b/Civi/Test/CiviTestListener.php
index 3bd6f0dbc5d2e658afa87102e55e19c019cbb476..2f50529ee60647f7342098ea61b549a35de2d67f 100644 (file)
--- a/Civi/Test/CiviTestListener.php
+++ b/Civi/Test/CiviTestListener.php
@@ -95,10 +95,10 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
 
     $test->setUpHeadless();
 
-    $config = \CRM_Core_Config::singleton(TRUE, TRUE); // ugh, performance
     \CRM_Utils_System::flushCache();
     \Civi::reset();
     \CRM_Core_Session::singleton()->set('userID', NULL);
+    $config = \CRM_Core_Config::singleton(TRUE, TRUE); // ugh, performance
 
     if (property_exists($config->userPermissionClass, 'permissions')) {
       $config->userPermissionClass->permissions = NULL;
@@ -176,8 +176,8 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
     }
 
     $blurb = "Tip: Run the headless tests and end-to-end tests separately, e.g.\n"
-      . "  $ phpunit4 --group headless\n"
-      . "  $ phpunit4 --group e2e  \n";
+      . "  $ phpunit5 --group headless\n"
+      . "  $ phpunit5 --group e2e  \n";
 
     if (!empty($byInterface['HeadlessInterface']) && CIVICRM_UF !== 'UnitTests') {
       $testNames = implode(', ', array_keys($byInterface['HeadlessInterface']));