diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-05-16 02:09:22 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-05-16 02:09:22 +0000 |
| commit | a628fe811e6bf4d01e60736342193db39b6d4580 (patch) | |
| tree | ed2e86a52796498f1240e0bf50a610edad312c37 /modules | |
| parent | 9d4dea4e55d985ea17ea48d61a3166da7f2f1a9f (diff) | |
| download | brdo-a628fe811e6bf4d01e60736342193db39b6d4580.tar.gz brdo-a628fe811e6bf4d01e60736342193db39b6d4580.tar.bz2 | |
- Patch #246259 by boombatower and saxofaan: enabling/disabling modules doesn't check for failures.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 822750afe..3084355d5 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -190,8 +190,7 @@ class DrupalWebTestCase extends UnitTestCase { */ function drupalModuleEnable($name) { if (module_exists($name)) { - $this->pass(t('@name module already enabled', array('@name' => $name)), t('Module')); - return TRUE; + return $this->pass(t('@name module already enabled', array('@name' => $name)), t('Module')); } $this->_modules[$name] = $name; $form_state['values'] = array('status' => $this->_modules, 'op' => t('Save configuration')); @@ -204,10 +203,7 @@ class DrupalWebTestCase extends UnitTestCase { cache_clear_all('schema', 'cache'); module_rebuild_cache(); - if (module_exists($name)) { - $this->pass(t('@name enabled.', array('@name' => $name)), t('Module')); - return TRUE; - } + return $this->assertTrue(module_exists($name), t('@name enabled.', array('@name' => $name)), t('Module')); } /** @@ -219,8 +215,7 @@ class DrupalWebTestCase extends UnitTestCase { */ function drupalModuleDisable($name) { if (!module_exists($name)) { - $this->pass(t('@name module already disabled', array('@name' => $name)), t('Module')); - return TRUE; + return $this->pass(t('@name module already disabled', array('@name' => $name)), t('Module')); } unset($this->_modules[$key]); $form_state['values'] = array('status' => $this->_modules, 'op' => t('Save configuration')); @@ -233,10 +228,7 @@ class DrupalWebTestCase extends UnitTestCase { cache_clear_all('schema', 'cache'); module_rebuild_cache(); - if (!module_exists($name)) { - $this->pass(t('@name disabled.', array('@name' => $name)), t('Module')); - return TRUE; - } + return $this->assertTrue(!module_exists($name), t('@name disabled.', array('@name' => $name)), t('Module')); } /** |