summaryrefslogtreecommitdiff
path: root/modules/simpletest
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2013-12-29 17:04:09 -0500
committerDavid Rothstein <drothstein@gmail.com>2013-12-29 17:04:09 -0500
commit0b1196be860920904b4da4af8a74f5e5f27f4a82 (patch)
tree0bb2dcb4308b6e870a731f8c02b436819ef20dff /modules/simpletest
parentb5f311a892709002d460ad32a432ca3a0a9c9f23 (diff)
downloadbrdo-0b1196be860920904b4da4af8a74f5e5f27f4a82.tar.gz
brdo-0b1196be860920904b4da4af8a74f5e5f27f4a82.tar.bz2
Issue #1563620 by donquixote, David_Rothstein, chaby: Fix errors running unit tests in Drupal 7 when the Locale module is enabled.
Diffstat (limited to 'modules/simpletest')
-rw-r--r--modules/simpletest/drupal_web_test_case.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 0853c7d96..cb15a6367 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -730,6 +730,10 @@ class DrupalUnitTestCase extends DrupalTestCase {
// subsequently will fail as the database is not accessible.
$module_list = module_list();
if (isset($module_list['locale'])) {
+ // Transform the list into the format expected as input to module_list().
+ foreach ($module_list as &$module) {
+ $module = array('filename' => drupal_get_filename('module', $module));
+ }
$this->originalModuleList = $module_list;
unset($module_list['locale']);
module_list(TRUE, FALSE, FALSE, $module_list);