From c1d2d11f92fed85c8577922fdbe95dc285ddacef Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Fri, 15 Jan 2010 03:07:34 +0000
Subject: [PATCH] #685004 by Dave Reid: Fixed Cannot run tests under
non-standard profile.
---
modules/simpletest/drupal_web_test_case.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 471d9e41b06f..38beb0bc15dc 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1092,7 +1092,7 @@ protected function drupalLogout() {
* List of modules to enable for the duration of the test.
*/
protected function setUp() {
- global $db_prefix, $user, $language;
+ global $db_prefix, $user, $language, $conf;
// Store necessary current values before switching to prefixed database.
$this->originalLanguage = $language;
@@ -1127,7 +1127,9 @@ protected function setUp() {
ini_set('log_errors', 1);
ini_set('error_log', $public_files_directory . '/error.log');
- // Reset all statics so that test is performed with a clean environment.
+ // Reset all statics and variables so that test is performed with a clean
+ // environment.
+ $conf = array();
drupal_static_reset();
include_once DRUPAL_ROOT . '/includes/install.inc';
--
GitLab