Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #470992 by chx: disable locale module while running tests.

merge-requests/26/head
Dries Buytaert 2009-05-24 07:04:33 +00:00
parent 48f8c88a21
commit c9e4bbf91d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/simpletest/drupal_web_test_case.php
View File

@ -864,9 +864,11 @@ class DrupalWebTestCase {
* List of modules to enable for the duration of the test. * List of modules to enable for the duration of the test.
*/ */
protected function setUp() { protected function setUp() {
global $db_prefix, $user; global $db_prefix, $user, $language;
// Store necessary current values before switching to prefixed database. // Store necessary current values before switching to prefixed database.
$this->originalLanguage = $language;
$this->originalLanguageDefault = variable_get('language_default');
$this->originalPrefix = $db_prefix; $this->originalPrefix = $db_prefix;
$this->originalFileDirectory = file_directory_path(); $this->originalFileDirectory = file_directory_path();
$clean_url_original = variable_get('clean_url', 0); $clean_url_original = variable_get('clean_url', 0);
@ -910,6 +912,9 @@ class DrupalWebTestCase {
variable_set('install_task', 'profile-finished'); variable_set('install_task', 'profile-finished');
variable_set('clean_url', $clean_url_original); variable_set('clean_url', $clean_url_original);
variable_set('site_mail', 'simpletest@example.com'); variable_set('site_mail', 'simpletest@example.com');
// Set up English language.
unset($GLOBALS['conf']['language_default']);
$language = language_default();
// Use temporary files directory with the same prefix as database. // Use temporary files directory with the same prefix as database.
variable_set('file_directory_path', $this->originalFileDirectory . '/' . $db_prefix); variable_set('file_directory_path', $this->originalFileDirectory . '/' . $db_prefix);
@ -953,7 +958,7 @@ class DrupalWebTestCase {
* and reset the database prefix. * and reset the database prefix.
*/ */
protected function tearDown() { protected function tearDown() {
global $db_prefix, $user; global $db_prefix, $user, $language;
if (preg_match('/simpletest\d+/', $db_prefix)) { if (preg_match('/simpletest\d+/', $db_prefix)) {
// Delete temporary files directory and reset files directory path. // Delete temporary files directory and reset files directory path.
file_unmanaged_delete_recursive(file_directory_path()); file_unmanaged_delete_recursive(file_directory_path());
@ -988,6 +993,12 @@ class DrupalWebTestCase {
// Rebuild caches. // Rebuild caches.
$this->refreshVariables(); $this->refreshVariables();
// Reset language
$language = $this->originalLanguage;
if ($this->originalLanguageDefault) {
$GLOBALS['conf']['language_default'] = $this->originalLanguageDefault;
}
// Close the CURL handler. // Close the CURL handler.
$this->curlClose(); $this->curlClose();
} }