diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-13 05:50:09 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-13 05:50:09 +0000 |
commit | 413008b8909370514096cdc8a5fc186f5babd234 (patch) | |
tree | 5068c96d3751e3486e7af0cdfdc3092083c6b5ce /modules/simpletest/tests/upgrade/upgrade.test | |
parent | 163808d2f1f5b16999ec427a153188e9a67b596a (diff) | |
download | brdo-413008b8909370514096cdc8a5fc186f5babd234.tar.gz brdo-413008b8909370514096cdc8a5fc186f5babd234.tar.bz2 |
#898520 follow-up by Damien Tournoud, chx, David Rothstein: Clean-up the upgrade path: comment.
Diffstat (limited to 'modules/simpletest/tests/upgrade/upgrade.test')
-rw-r--r-- | modules/simpletest/tests/upgrade/upgrade.test | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/modules/simpletest/tests/upgrade/upgrade.test b/modules/simpletest/tests/upgrade/upgrade.test index 47d63a22c..481f7b90a 100644 --- a/modules/simpletest/tests/upgrade/upgrade.test +++ b/modules/simpletest/tests/upgrade/upgrade.test @@ -7,9 +7,11 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase { /** - * The file path to the dumped database to load into the child site. + * The file path(s) to the dumped database(s) to load into the child site. + * + * @var array */ - var $databaseDumpFile = NULL; + var $databaseDumpFiles = array(); /** * Flag that indicates whether the child site has been upgraded. @@ -88,7 +90,9 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase { $conf = array(); // Load the database from the portable PHP dump. - require $this->databaseDumpFile; + foreach ($this->databaseDumpFiles as $file) { + require $file; + } // Set path variables. $this->variable_set('file_public_path', $public_files_directory); @@ -328,8 +332,10 @@ class BasicUpgradePath extends UpgradePathTestCase { } public function setUp() { - // Path to the database dump. - $this->databaseDumpFile = drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-6.bare.database.php'; + // Path to the database dump files. + $this->databaseDumpFiles = array( + drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-6.bare.database.php', + ); parent::setUp(); } |