diff -u b/modules/simpletest/tests/module_test.info b/modules/simpletest/tests/module_test.info --- b/modules/simpletest/tests/module_test.info +++ b/modules/simpletest/tests/module_test.info @@ -7,4 +7,4 @@ -# Depends on the Node module to test making a module required using -# hook_system_info_alter() and ensuring that its dependencies also become -# required. -dependencies[] = node \ Geen regeleindeteken (LF) aan einde van bestand +; Depends on the Node module to test making a module required using +; hook_system_info_alter() and ensuring that its dependencies also become +; required. +dependencies[] = list diff -u b/modules/simpletest/tests/module_test.module b/modules/simpletest/tests/module_test.module --- b/modules/simpletest/tests/module_test.module +++ b/modules/simpletest/tests/module_test.module @@ -53,7 +53,7 @@ $info['regions']['test_region'] = t('Test region'); } - if ($file->name == 'module_test' && variable_get('module_test.hook_system_info_alter')) { + if ($file->name == 'module_test' && variable_get('module_test_hook_system_info_alter')) { $info['required'] = TRUE; $info['explanation'] = 'Testing hook_system_info_alter()'; } diff -u b/modules/system/system.test b/modules/system/system.test --- b/modules/system/system.test +++ b/modules/system/system.test @@ -2145,9 +2145,9 @@ * return freshly altered info. */ function testSystemInfoAlter() { - variable_set('module_test.hook_system_info_alter', TRUE); + variable_set('module_test_hook_system_info_alter', TRUE); $info = system_rebuild_module_data(); - $this->assertFalse(isset($info['node']->info['required']), 'Before the module_test is installed the node module is not required.'); + $this->assertFalse(isset($info['list']->info['required']), 'Before the module_test is installed the list module is not required.'); // Enable our test module. Flush all caches, which we assert is the only // thing necessary to use the rebuilt {system}.info. module_enable(array('module_test'), FALSE); @@ -2163,6 +2163,9 @@ $this->assertTrue(isset($info['regions']['test_region']), 'Altered theme info was returned by system_list().'); $list_themes = list_themes(); $this->assertTrue(isset($list_themes['seven']->info['regions']['test_region']), 'Altered theme info was returned by list_themes().'); + $info = system_rebuild_module_data(); + $this->assertTrue($info['list']->info['required'], 'After the module_test is installed the list module is required.'); + variable_set('module_test_hook_system_info_alter', FALSE); // Disable the module and verify that {system}.info is rebuilt without it. module_disable(array('module_test'), FALSE); @@ -2178,10 +2181,6 @@ $this->assertFalse(isset($info['regions']['test_region']), 'Altered theme info was not returned by system_list().'); $list_themes = list_themes(); $this->assertFalse(isset($list_themes['seven']->info['regions']['test_region']), 'Altered theme info was not returned by list_themes().'); - system_list_reset(); - $info = system_rebuild_module_data(); - $this->assertTrue($info['node']->info['required'], 'After the module_test is installed the node module is required.'); - variable_set('module_test.hook_system_info_alter', FALSE); } /**