Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3e83565cf22332f5968cf77ac6861e8d3bd354ed https://github.com/phpmyadmin/phpmyadmin/commit/3e83565cf22332f5968cf77ac686... Author: Michal Čihař <michal@cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: ----------- Fix order of params to assertEquals Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 3d0f2370318702b27f3a36b42ab3cb38adb727c7 https://github.com/phpmyadmin/phpmyadmin/commit/3d0f2370318702b27f3a36b42ab3... Author: Michal Čihař <michal@cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: ----------- Fix expected message to match code Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 53cc186591f574299fe1951873fa9458b291b6e2 https://github.com/phpmyadmin/phpmyadmin/commit/53cc186591f574299fe1951873fa... Author: Michal Čihař <michal@cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Fixed ob_start/eval problems in phpunit When running in phpunit, the eval can raise exception, so treat it same as it would be output returned by the eval. Without catching it, output buffering gets one more level of nesting leading to occassional timeouts in Travis-CI. Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/199d560e8e5a...53cc186591f5