Commit 31bd760e authored by webchick's avatar webchick

Issue #1730754 by sun: Fixed UpgradePathTestBase::performUpgrade() does not...

Issue #1730754 by sun: Fixed UpgradePathTestBase::performUpgrade() does not always load all new modules after upgrade.
parent 203b4e61
......@@ -32,11 +32,6 @@ abstract class UpgradePathTestBase extends WebTestBase {
*/
var $upgradeErrors = array();
/**
* Array of modules loaded when the test starts.
*/
var $loadedModules = array();
/**
* Flag to indicate whether there are pending updates or not.
*/
......@@ -86,8 +81,6 @@ protected function setUp() {
$this->upgradedSite = FALSE;
$this->upgradeErrors = array();
$this->loadedModules = module_list();
// Create the database prefix for this test.
$this->prepareDatabasePrefix();
......@@ -254,8 +247,7 @@ protected function performUpgrade($register_errors = TRUE) {
// Reload module list. For modules that are enabled in the test database,
// but not on the test client, we need to load the code here.
system_list_reset();
$new_modules = array_diff(module_list(), $this->loadedModules);
foreach ($new_modules as $module) {
foreach (module_list() as $module) {
drupal_load('module', $module);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment