diff --git a/core/Db.php b/core/Db.php index 8eabee10cb9505eccb9862852e32e0c0a4f4f604..7fa4ab7fe40be7c2b08fa83f8c7145322d07479f 100644 --- a/core/Db.php +++ b/core/Db.php @@ -661,6 +661,8 @@ class Db private static function logExtraInfoIfDeadlock($ex) { + Log::debug($ex); // for debugging travis, remove + if (self::get()->isErrNo($ex, 1213)) { $deadlockInfo = self::fetchAll("SHOW ENGINE INNODB STATUS"); diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php index 5f8d7b715c91280dafc3873c0d2a6fbf9204f490..594ad5da368a29fd500627e03d7b90fc64eb4192 100644 --- a/tests/PHPUnit/proxy/index.php +++ b/tests/PHPUnit/proxy/index.php @@ -3,7 +3,6 @@ * Proxy to index.php, but will use the Test DB * Used by tests/PHPUnit/Integration/ImportLogsTest.php and tests/PHPUnit/Integration/UITest.php */ -define('PIWIK_PRINT_ERROR_BACKTRACE', 1); require realpath(dirname(__FILE__)) . "/includes.php"; diff --git a/tests/PHPUnit/travis.sh b/tests/PHPUnit/travis.sh index 6ad7d07c79c0224e0a9a2fae7645791202d41f32..c4f7873f2316ea8b619a2eba3353fa66671a55b1 100755 --- a/tests/PHPUnit/travis.sh +++ b/tests/PHPUnit/travis.sh @@ -55,6 +55,11 @@ then then travis_wait phpunit --configuration phpunit.xml --colors --testsuite $TEST_SUITE --group $PLUGIN_NAME else + if [ -n "$TEST_SUITE" = "Integration" ] + then + TEST_SUITE=ArchiveWebTest + fi + travis_wait phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors fi fi