From 303e0737244eebd055d74e2f6d75747a5cdb26da Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 18 Oct 2016 16:50:25 +0200 Subject: [PATCH] Do not skip when mysql uses utf8mb4 Signed-off-by: Joas Schilling --- tests/lib/Files/Cache/CacheTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php index 4a2581fbc5..4c4f43d63d 100644 --- a/tests/lib/Files/Cache/CacheTest.php +++ b/tests/lib/Files/Cache/CacheTest.php @@ -113,7 +113,8 @@ class CacheTest extends \Test\TestCase { public function testFolder($folder) { if(strpos($folder, 'F09F9890')) { // 4 byte UTF doesn't work on mysql - if(\OC::$server->getDatabaseConnection()->getDatabasePlatform() instanceof MySqlPlatform) { + $params = \OC::$server->getDatabaseConnection()->getParams(); + if(\OC::$server->getDatabaseConnection()->getDatabasePlatform() instanceof MySqlPlatform && $params['charset'] !== 'utf8mb4') { $this->markTestSkipped('MySQL doesn\'t support 4 byte UTF-8'); } }