? .svn ? frameworkpatch ? patch.patch ? php5powah_tests.patch ? prefixing.patch ? simpletest ? simpletest_orig Index: drupal_test_case.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_test_case.php,v retrieving revision 1.63 diff -b -u -p -r1.63 drupal_test_case.php --- drupal_test_case.php 23 Mar 2008 03:35:38 -0000 1.63 +++ drupal_test_case.php 23 Mar 2008 04:48:35 -0000 @@ -446,7 +446,7 @@ class DrupalTestCase extends UnitTestCas * Also, see the description of $curl_options among the properties. */ protected function curlConnect() { - global $base_url; + global $base_url, $db_prefix; if (!isset($this->ch)) { $this->ch = curl_init(); $curl_options = $this->curl_options + array( @@ -455,6 +455,9 @@ class DrupalTestCase extends UnitTestCas CURLOPT_FOLLOWLOCATION => TRUE, CURLOPT_RETURNTRANSFER => TRUE, ); + if (preg_match('/simpletest\d+/', $db_prefix)) { + $curl_options[CURLOPT_USERAGENT] = $db_prefix; + } if (!isset($curl_options[CURLOPT_USERPWD]) && ($auth = variable_get('simpletest_httpauth_username', ''))) { if ($pass = variable_get('simpletest_httpauth_pass', '')) { $auth .= ':'. $pass; Index: simpletest.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/simpletest.module,v retrieving revision 1.37 diff -b -u -p -r1.37 simpletest.module --- simpletest.module 23 Mar 2008 03:35:38 -0000 1.37 +++ simpletest.module 23 Mar 2008 04:48:35 -0000 @@ -205,10 +205,25 @@ function simpletest_overview_form() { * @param boolean $html_reporter true if you want results in simple html, FALSE for full drupal page */ function simpletest_run_tests($testlist = NULL, $reporter = 'drupal') { - static $test_running; + global $test_running, $db_prefix, $simpletest_ua_handling; + static $db_prefix_original, $test_running; if (!$test_running) { $test_running = TRUE; $test = simpletest_get_total_test($testlist); + if ($simpletest_ua_handling) { + $db_prefix_original = $db_prefix; + $db_prefix = 'simpletest'. mt_rand(1000, 1000000); + include_once './includes/install.inc'; + drupal_install_system(); + $module_list = drupal_verify_profile('default', 'en'); + drupal_install_modules($module_list); + default_profile_tasks(); + menu_rebuild(); + actions_synchronize(); + _drupal_flush_css_js(); + variable_set('install_profile', 'default'); + variable_set('install_task', 'profile-finished'); + } switch ($reporter) { case 'text': $reporter = &new TextReporter(); @@ -226,6 +241,14 @@ function simpletest_run_tests($testlist cache_clear_all(); $results = $test->run($reporter); + if (preg_match('/simpletest\d+/', $db_prefix)) { + $schema = drupal_get_schema(NULL, TRUE); + $ret = array(); + foreach ($schema as $name => $table) { + db_drop_table($ret, $name); + } + $db_prefix = $db_prefix_original; + } $test_running = FALSE; switch (get_class($reporter)) {