Updated Drupal to 8.6. This goes with the following updates because it's possible...

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

diff --git a/web/core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateTest.php b/web/core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateTest.php
index d1a3cabb06ed2aa2f33bf8528193365c29349e8b..653a437239517a8e02383289eb7e236414f663a2 100644 (file)
--- a/web/core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateTest.php
@@ -9,6 +9,7 @@ use Drupal\FunctionalTests\Update\UpdatePathTestBase;
  * Tests that the entity langcode fields have been updated to varchar_ascii.
  *
  * @group Entity
+ * @group legacy
  */
 class LangcodeToAsciiUpdateTest extends UpdatePathTestBase {
 
@@ -39,7 +40,8 @@ class LangcodeToAsciiUpdateTest extends UpdatePathTestBase {
     ];
     foreach ($tables as $table => $columns) {
       foreach ($columns as $column) {
-        $this->assertEqual('utf8mb4_general_ci', $this->getColumnCollation($table, $column), 'Found correct starting collation for ' . $table . '.' . $column);
+        // Depending on MYSQL versions you get different collations.
+        $this->assertContains($this->getColumnCollation($table, $column), ['utf8mb4_0900_ai_ci', 'utf8mb4_general_ci'], 'Found correct starting collation for ' . $table . '.' . $column);
       }
     }