Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2565241 by alexpott: First test fails on postgres because of a stale connection

8.0.x
Nathaniel Catchpole 2015-09-09 14:47:05 +01:00
parent a2059f6277
commit d7509faee9
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/modules/simpletest/src/KernelTestBase.php
View File

@ -190,6 +190,22 @@ EOD;
} }
$this->kernel->boot(); $this->kernel->boot();
// Ensure database install tasks have been run.
require_once __DIR__ . '/../../../includes/install.inc';
$connection = Database::getConnection();
$errors = db_installer_object($connection->driver())->runTasks();
if (!empty($errors)) {
$this->fail('Failed to run installer database tasks: ' . implode(', ', $errors));
}
// Reboot the kernel because the container might contain a connection to the
// database that has been closed during the database install tasks. This
// prevents any services created during the first boot from having stale
// database connections, for example, \Drupal\Core\Config\DatabaseStorage.
$this->kernel->shutdown();
$this->kernel->boot();
// Save the original site directory path, so that extensions in the // Save the original site directory path, so that extensions in the
// site-specific directory can still be discovered in the test site // site-specific directory can still be discovered in the test site
// environment. // environment.
@ -222,14 +238,6 @@ EOD;
// the event dispatcher which can prevent modules from registering events. // the event dispatcher which can prevent modules from registering events.
\Drupal::service('config.storage')->write('core.extension', array('module' => array(), 'theme' => array())); \Drupal::service('config.storage')->write('core.extension', array('module' => array(), 'theme' => array()));
// Ensure database tasks have been run.
require_once __DIR__ . '/../../../includes/install.inc';
$connection = Database::getConnection();
$errors = db_installer_object($connection->driver())->runTasks();
if (!empty($errors)) {
$this->fail('Failed to run installer database tasks: ' . implode(', ', $errors));
}
// Collect and set a fixed module list. // Collect and set a fixed module list.
$class = get_class($this); $class = get_class($this);
$modules = array(); $modules = array();