aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-10-18 16:50:25 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-10-19 00:15:01 +0200
commit303e0737244eebd055d74e2f6d75747a5cdb26da (patch)
tree68c8db023f0903351ba2f0759ea83262236e7ee7 /tests
parent43b7b143f46fd59911ef463d60d158dcc925d4af (diff)
downloadnextcloud-server-303e0737244eebd055d74e2f6d75747a5cdb26da.tar.gz
nextcloud-server-303e0737244eebd055d74e2f6d75747a5cdb26da.zip
Do not skip when mysql uses utf8mb4
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/Files/Cache/CacheTest.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php
index 4a2581fbc54..4c4f43d63d5 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');
}
}