Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / system / tests / src / Functional / Update / UpdatePathWithBrokenRoutingTest.php

diff --git a/web/core/modules/system/src/Tests/Update/UpdatePathWithBrokenRoutingTest.php b/web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingTest.php
similarity index 56%
rename from web/core/modules/system/src/Tests/Update/UpdatePathWithBrokenRoutingTest.php
rename to web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingTest.php
index e710a4ecaf756cd1d73fdcb7b9a86270816b85d9..1c8493d94642c4ff204541c0c08ea89548e8a301 100644 (file)
--- a/web/core/modules/system/src/Tests/Update/UpdatePathWithBrokenRoutingTest.php
+++ b/web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Drupal\system\Tests\Update;
+namespace Drupal\Tests\system\Functional\Update;
+
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests the update path with a broken router.
@@ -14,8 +16,8 @@ class UpdatePathWithBrokenRoutingTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/drupal-8.broken_routing.php',
+      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.broken_routing.php',
     ];
   }
 
@@ -30,16 +32,6 @@ class UpdatePathWithBrokenRoutingTest extends UpdatePathTestBase {
     $this->drupalGet('<front>');
     $this->assertResponse(500);
 
-    // The exceptions are expected. Do not interpret them as a test failure.
-    // Not using File API; a potential error must trigger a PHP warning.
-    unlink(\Drupal::root() . '/' . $this->siteDirectory . '/error.log');
-    foreach ($this->assertions as $key => $assertion) {
-      if (strpos($assertion['message'], 'core/modules/system/tests/modules/update_script_test/src/PathProcessor/BrokenInboundPathProcessor.php') !== FALSE) {
-        unset($this->assertions[$key]);
-        $this->deleteAssert($assertion['message_id']);
-      }
-    }
-
     $this->runUpdates();
 
     // Remove the simulation of the broken router, and make sure we can get to