diff options
| author | sgiehl <stefan@piwik.org> | 2014-10-21 22:44:23 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-10-21 22:44:23 +0400 |
| commit | 08b47615a17b122a753c11407ca76844fc79dae6 (patch) | |
| tree | 03c51af1e5d861fd26dc34118c63777b377fc35c /plugins/Contents/tests/System | |
| parent | 6ba3965c2878d123514d951c60e77c1d697438ad (diff) | |
| parent | 9fef02e4483bae2f252b8316b208aa392cb7e11b (diff) | |
Merge branch 'master' into deprecate_usersettings
Conflicts:
core/Version.php
Diffstat (limited to 'plugins/Contents/tests/System')
| -rw-r--r-- | plugins/Contents/tests/System/ContentsTest.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/Contents/tests/System/ContentsTest.php b/plugins/Contents/tests/System/ContentsTest.php index 4332217622..b555cf7962 100644 --- a/plugins/Contents/tests/System/ContentsTest.php +++ b/plugins/Contents/tests/System/ContentsTest.php @@ -27,6 +27,9 @@ class ContentsTest extends SystemTestCase */ public function testApi($api, $params) { + if(self::isMysqli()) { + $this->markTestSkipped('Sometimes fail on MYSQLI (at random)'); + } $this->runApiTests($api, $params); } |