Verified Commit d6b0be89 authored by Jess's avatar Jess
Browse files

fix: #3560690 Functional update tests consistently fail on mysqli 

By: andypost
By: mondrake
By: smustgrave
(cherry picked from commit 0d98f6ee)
parent cc680edc

.gitlab-ci.yml

+20 −2
Original line number Diff line number Diff line
@@ -413,9 +413,18 @@ default: 
    _TARGET_PHP: $MINIMUM_PHP

    _TARGET_DB: "pgsql-16"



'[Commit] PHP 8.3 SQLite 3.45':

'[Commit] PHP 8.3 MySQL 9 via mysqli':

  <<: [ *default-stage, *run-on-commit ]

  needs: [ '[Commit] PHP 8.3 PostgreSQL 16' ]

  variables:

    _TARGET_PHP: $MINIMUM_PHP

    _TARGET_DB: "mysql-9"

    _TARGET_DB_DRIVER: "mysqli"

    _TARGET_DB_DRIVER_MODULE: "mysqli"



'[Commit] PHP 8.3 SQLite 3.45':

  <<: [ *default-stage, *run-on-commit ]

  needs: [ '[Commit] PHP 8.3 MySQL 9 via mysqli' ]

  variables:

    _TARGET_PHP: $MINIMUM_PHP

    _TARGET_DB: "sqlite-3"
@@ -429,9 +438,18 @@ default: 
    _TARGET_PHP: $MINIMUM_PHP

    _TARGET_DB: "pgsql-16"



'[Daily] PHP minimum SQLite 3.45':

'[Daily] PHP 8.5 MySQL 9 via mysqli':

  <<: [ *default-stage, *run-daily ]

  needs: [ '[Daily] PHP minimum PostgreSQL 16' ]

  variables:

    _TARGET_PHP: "8.5-ubuntu"

    _TARGET_DB: "mysql-9"

    _TARGET_DB_DRIVER: "mysqli"

    _TARGET_DB_DRIVER_MODULE: "mysqli"



'[Daily] PHP minimum SQLite 3.45':

  <<: [ *default-stage, *run-daily ]

  needs: [ '[Daily] PHP 8.5 MySQL 9 via mysqli' ]

  variables:

    _TARGET_PHP: $MINIMUM_PHP

    _TARGET_DB: "sqlite-3"

core/tests/Drupal/Tests/BrowserTestBase.php

+6 −4
Original line number Diff line number Diff line
@@ -422,10 +422,12 @@ protected function tearDown(): void { 


    if ($this->container) {

      // Cleanup mock session started in DrupalKernel::preHandle().

      if ($this->container->has('request_stack')) {

        /** @var \Symfony\Component\HttpFoundation\Session\Session $session */

        $session = $this->container->get('request_stack')->getSession();

        $session->clear();

        $session->save();

      }



      // If cron is running because Automated Cron started it at the end of a

      // test request, wait for it to complete.