diff --git a/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php b/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php index 7a05f4d..85d6b0b 100644 --- a/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php +++ b/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php @@ -42,8 +42,6 @@ public function testFieldPluginDefinitionIntegrity() { return array_keys($module->requires); }, $modules)); $modules = array_unique(NestedArray::mergeDeep(array_keys($modules), $dependencies)); - // Remove any modules already enabled. - $modules = array_diff($modules, static::$modules); $this->enableModules($modules); diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php index 6a35f15..7c272f0 100644 --- a/core/tests/Drupal/KernelTests/KernelTestBase.php +++ b/core/tests/Drupal/KernelTests/KernelTestBase.php @@ -814,7 +814,7 @@ protected function enableModules(array $modules) { foreach ($modules as $module) { if ($module_handler->moduleExists($module)) { - throw new \LogicException("$module module is already enabled."); + continue; } $module_handler->addModule($module, $module_list[$module]->getPath()); // Maintain the list of enabled modules in configuration.