Merge branch 'MDL-62408_33_STABLE' of https://github.com/marxjohnson/…

…moodle into MOODLE_33_STABLE
moodle · May 28, 2018 · 2ed6a29 · 2ed6a29
2 parents 7c84c19 + 6a5d9d0
commit 2ed6a29
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/behat/classes/behat_config_util.php b/lib/behat/classes/behat_config_util.php
@@ -672,7 +672,7 @@ protected function get_behat_profile($profile, $values) {
     public function profile_guided_allocate($features, $nbuckets, $instance) {
 
         // No profile guided allocation is required in phpunit.
-        if (defined('PHPUNIT_TEST')) {
+        if (defined('PHPUNIT_TEST') && PHPUNIT_TEST) {
             return false;
         }
 
@@ -725,7 +725,8 @@ public function profile_guided_allocate($features, $nbuckets, $instance) {
             $totalweight += $weight;
         }
 
-        if ($totalweight && !defined('BEHAT_DISABLE_HISTOGRAM') && $instance == $nbuckets && !defined('PHPUNIT_TEST')) {
+        if ($totalweight && !defined('BEHAT_DISABLE_HISTOGRAM') && $instance == $nbuckets
+                && (!defined('PHPUNIT_TEST') || !PHPUNIT_TEST)) {
             echo "Bucket weightings:\n";
             foreach ($weights as $k => $weight) {
                 echo $k + 1 . ": " . str_repeat('*', 70 * $nbuckets * $weight / $totalweight) . PHP_EOL;
@@ -960,7 +961,7 @@ protected function remove_blacklisted_features_from_list($features, $blacklist)
                 unset($features[$key]);
             } else {
                 $featurestocheck = $this->get_components_features();
-                if (!isset($featurestocheck[$key]) && !defined('PHPUNIT_TEST')) {
+                if (!isset($featurestocheck[$key]) && (!defined('PHPUNIT_TEST') || !PHPUNIT_TEST)) {
                     behat_error(BEHAT_EXITCODE_REQUIREMENT, 'Blacklisted feature "' . $blacklistpath . '" not found.');
                 }
             }