summaryrefslogtreecommitdiff
path: root/modules/simpletest
diff options
context:
space:
mode:
Diffstat (limited to 'modules/simpletest')
-rw-r--r--modules/simpletest/drupal_web_test_case.php3
-rw-r--r--modules/simpletest/tests/module_test.module3
-rw-r--r--modules/simpletest/tests/upgrade/upgrade.test3
3 files changed, 3 insertions, 6 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index d75f761d6..a8692464b 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1315,9 +1315,6 @@ class DrupalWebTestCase extends DrupalTestCase {
drupal_static_reset();
drupal_flush_all_caches();
- // Register actions declared by any modules.
- actions_synchronize();
-
// Reload global $conf array and permissions.
$this->refreshVariables();
$this->checkPermissions(array(), TRUE);
diff --git a/modules/simpletest/tests/module_test.module b/modules/simpletest/tests/module_test.module
index 82df306e7..facac7cfa 100644
--- a/modules/simpletest/tests/module_test.module
+++ b/modules/simpletest/tests/module_test.module
@@ -36,6 +36,9 @@ function module_test_system_info_alter(&$info, $file, $type) {
$info['dependencies'][] = 'php';
}
}
+ if ($file->name == 'seven' && $type == 'theme') {
+ $info['regions']['test_region'] = t('Test region');
+ }
}
/**
diff --git a/modules/simpletest/tests/upgrade/upgrade.test b/modules/simpletest/tests/upgrade/upgrade.test
index 481f7b90a..3d463c95f 100644
--- a/modules/simpletest/tests/upgrade/upgrade.test
+++ b/modules/simpletest/tests/upgrade/upgrade.test
@@ -283,9 +283,6 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
drupal_static_reset();
drupal_flush_all_caches();
- // Register actions declared by any modules.
- actions_synchronize();
-
// Reload global $conf array and permissions.
$this->refreshVariables();
$this->checkPermissions(array(), TRUE);