--- /home/jchabot/Glcp/dev/drupal/drupal-7.8/modules/simpletest/drupal_web_test_case.php	2011-08-31 14:55:34.000000000 -0400
+++ /home/jchabot/glcp_web/drupal/modules/simpletest/drupal_web_test_case.php	2011-10-19 10:23:42.000000000 -0400
@@ -1227,6 +1227,9 @@
    * @param ...
    *   List of modules to enable for the duration of the test. This can be
    *   either a single array or a variable number of string arguments.
+   *
+   * @version 20111019 Jocelyn Chabot
+   *    Managing simpletest prefixes.
    */
   protected function setUp() {
     global $user, $language, $conf;
@@ -1242,11 +1245,24 @@
     $connection_info = Database::getConnectionInfo('default');
     Database::renameConnection('default', 'simpletest_original_default');
     foreach ($connection_info as $target => $value) {
+      // Get simpletest prefixes
+      $simpletest_prefixes = '';
+      if (is_array($value['prefix']) &&
+      isset($value['prefix']['simpletest.prefixes'])) {
+        $simpletest_prefixes = $value['prefix']['simpletest.prefixes'];
+      }
+
       $connection_info[$target]['prefix'] = array(
         'default' => $value['prefix']['default'] . $this->databasePrefix,
       );
+
+      // Add simpletest prefixes
+      if (!empty($simpletest_prefixes)) {
+        $connection_info[$target]['prefix']['simpletest.prefixes'] =
+          $simpletest_prefixes;
+      }
     }
-    Database::addConnectionInfo('default', 'default', $connection_info['default']);
+	  Database::addConnectionInfo('default', 'default', $connection_info['default']);
 
     // Store necessary current values before switching to prefixed database.
     $this->originalLanguage = $language;