diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-11-01 21:21:35 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-11-01 21:21:35 +0000 |
| commit | fa94c66c92eaec0a636fa4f92b8496f7c38fc54a (patch) | |
| tree | e4256186f9897e9b062cf7bb9d5bd84170182bb8 /modules/simpletest/drupal_web_test_case.php | |
| parent | 424250196a65b48919de50b2a3327f67c076e0d3 (diff) | |
| download | brdo-fa94c66c92eaec0a636fa4f92b8496f7c38fc54a.tar.gz brdo-fa94c66c92eaec0a636fa4f92b8496f7c38fc54a.tar.bz2 | |
- Patch #328719 by c960657: make the module list tests succeed again.
Diffstat (limited to 'modules/simpletest/drupal_web_test_case.php')
| -rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index e63a3442e..2a0c38c26 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -689,7 +689,7 @@ class DrupalWebTestCase { $clean_url_original = variable_get('clean_url', 0); // Generate temporary prefixed database to ensure that tests have a clean starting point. - $db_prefix = 'simpletest' . mt_rand(1000, 1000000); + $db_prefix = Database::getActiveConnection()->prefixTables('{simpletest' . mt_rand(1000, 1000000) . '}'); include_once DRUPAL_ROOT . '/includes/install.inc'; drupal_install_system(); @@ -800,8 +800,8 @@ class DrupalWebTestCase { CURLOPT_SSL_VERIFYPEER => FALSE, // Required to make the tests run on https:// CURLOPT_SSL_VERIFYHOST => FALSE, // Required to make the tests run on https:// ); - if (preg_match('/simpletest\d+/', $db_prefix)) { - $curl_options[CURLOPT_USERAGENT] = $db_prefix; + if (preg_match('/simpletest\d+/', $db_prefix, $matches)) { + $curl_options[CURLOPT_USERAGENT] = $matches[0]; } if (!isset($curl_options[CURLOPT_USERPWD]) && ($auth = variable_get('simpletest_httpauth_username', ''))) { if ($pass = variable_get('simpletest_httpauth_pass', '')) { |