Issue #3245383 by Beakerboy, daffie: If the database driver is provided by a...

Issue #3245383 by Beakerboy, daffie: If the database driver is provided by a module, it's name must be included in tests which check for enabled modules

core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php

@@ -26,7 +26,11 @@ class ModuleHandlerTest extends KernelTestBase {
    */
   public function testModuleList() {
     $module_list = ['system'];
-
+    $database_module = \Drupal::database()->getProvider();
+    if ($database_module !== 'core') {
+      $module_list[] = $database_module;
+    }
+    sort($module_list);
     $this->assertModuleList($module_list, 'Initial');
 
     // Try to install a new module.

core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php

@@ -125,6 +125,10 @@ protected function setUp(): void {
     $this->allModules[] = 'system';
     $this->allModules[] = 'user';
     $this->allModules[] = 'path_alias';
+    $database_module = \Drupal::database()->getProvider();
+    if ($database_module !== 'core') {
+      $this->allModules[] = $database_module;
+    }
     sort($this->allModules);
     $this->container->get('module_installer')->install($this->allModules);
 

core/tests/Drupal/KernelTests/Core/Common/DrupalFlushAllCachesTest.php

@@ -34,14 +34,29 @@ public function testDrupalFlushAllCachesModuleList() {
     $core_extension->set('module', module_config_sort($module))->save();
     $this->containerBuilds = 0;
     drupal_flush_all_caches();
-    $this->assertSame(['system_test', 'system'], array_keys($this->container->getParameter('container.modules')));
+    $module_list = ['system_test', 'system'];
+    $database_module = \Drupal::database()->getProvider();
+    if ($database_module !== 'core') {
+      $module_list[] = $database_module;
+    }
+    sort($module_list);
+    $container_modules = array_keys($this->container->getParameter('container.modules'));
+    sort($container_modules);
+    $this->assertSame($module_list, $container_modules);
     $this->assertSame(1, $this->containerBuilds);
     $this->assertTrue(function_exists('system_test_help'));
 
     $core_extension->clear('module.system_test')->save();
     $this->containerBuilds = 0;
     drupal_flush_all_caches();
-    $this->assertSame(['system'], array_keys($this->container->getParameter('container.modules')));
+    $module_list = ['system'];
+    if ($database_module !== 'core') {
+      $module_list[] = $database_module;
+    }
+    sort($module_list);
+    $container_modules = array_keys($this->container->getParameter('container.modules'));
+    sort($container_modules);
+    $this->assertSame($module_list, $container_modules);
     $this->assertSame(1, $this->containerBuilds);
   }
 

core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php

@@ -74,6 +74,10 @@ protected function setUp(): void {
     $this->allModules[] = 'system';
     $this->allModules[] = 'user';
     $this->allModules[] = 'path_alias';
+    $database_module = \Drupal::database()->getProvider();
+    if ($database_module !== 'core') {
+      $this->allModules[] = $database_module;
+    }
     sort($this->allModules);
     $this->container->get('module_installer')->install($this->allModules);
 

core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php

@@ -74,6 +74,10 @@ protected function setUp(): void {
     $this->allModules[] = 'system';
     $this->allModules[] = 'user';
     $this->allModules[] = 'path_alias';
+    $database_module = \Drupal::database()->getProvider();
+    if ($database_module !== 'core') {
+      $this->allModules[] = $database_module;
+    }
     sort($this->allModules);
     $this->container->get('module_installer')->install($this->allModules);