Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 694daa01dd67f03af1d3178676e130ce58ae1758 https://github.com/phpmyadmin/phpmyadmin/commit/694daa01dd67f03af1d3178676e1... Author: Jeff Chan jefftchan@gmail.com Date: 2014-03-14 (Fri, 14 Mar 2014)

Changed paths: M test/libraries/PMA_ConfigGenerator_test.php

Log Message: ----------- Cache date in ConfigGenerator unit test

Occasionally we run into timing issues. For example, if the config is generated at 12:00:59PM and the assertion is at 12:01:00PM, then the test will fail. This should bring the expected $date closer to when the config is generated.

Signed-off-by: Jeff Chan jefftchan@gmail.com

Commit: bb280c8cc1207491d57a25a8d9e5c5363053de9d https://github.com/phpmyadmin/phpmyadmin/commit/bb280c8cc1207491d57a25a8d9e5... Author: Michal Čihař michal@cihar.com Date: 2014-03-15 (Sat, 15 Mar 2014)

Changed paths: M test/libraries/PMA_ConfigGenerator_test.php

Log Message: ----------- Merge pull request #1068 from jeffchan/fix-config-generator-test

Cache date in ConfigGenerator unit test

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b1f025fb737...bb280c8cc120