Unverified Commit daab6ad7 authored by alexpott's avatar alexpott
Browse files

Issue #3003401 by Sam152: UpdatePathTestBase calls setDatabaseDumpFiles twice,...

Issue #3003401 by Sam152: UpdatePathTestBase calls setDatabaseDumpFiles twice, resulting in duplicate fixtures in some scenarios
parent 93b73a58
...@@ -159,8 +159,6 @@ protected function setUp() { ...@@ -159,8 +159,6 @@ protected function setUp() {
// Install Drupal test site. // Install Drupal test site.
$this->prepareEnvironment(); $this->prepareEnvironment();
$this->runDbTasks(); $this->runDbTasks();
// Allow classes to set database dump files.
$this->setDatabaseDumpFiles();
// We are going to set a missing zlib requirement property for usage // We are going to set a missing zlib requirement property for usage
// during the performUpgrade() and tearDown() methods. Also set that the // during the performUpgrade() and tearDown() methods. Also set that the
......
...@@ -23,11 +23,9 @@ class UpdatePathTestBaseTest extends UpdatePathTestBase { ...@@ -23,11 +23,9 @@ class UpdatePathTestBaseTest extends UpdatePathTestBase {
* {@inheritdoc} * {@inheritdoc}
*/ */
protected function setDatabaseDumpFiles() { protected function setDatabaseDumpFiles() {
$this->databaseDumpFiles = [ $this->databaseDumpFiles[] = __DIR__ . '/../../../../modules/system/tests/fixtures/update/drupal-8.8.0.bare.standard.php.gz';
__DIR__ . '/../../../../modules/system/tests/fixtures/update/drupal-8.8.0.bare.standard.php.gz', $this->databaseDumpFiles[] = __DIR__ . '/../../../../modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php';
__DIR__ . '/../../../../modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php', $this->databaseDumpFiles[] = __DIR__ . '/../../../../modules/system/tests/fixtures/update/drupal-8.update-test-semver-update-n-enabled.php';
__DIR__ . '/../../../../modules/system/tests/fixtures/update/drupal-8.update-test-semver-update-n-enabled.php',
];
} }
/** /**
...@@ -212,4 +210,11 @@ public function testSchemaChecking() { ...@@ -212,4 +210,11 @@ public function testSchemaChecking() {
} }
/**
* Test the database fixtures are setup correctly.
*/
public function testFixturesSetup() {
$this->assertCount(3, $this->databaseDumpFiles);
}
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment