From 073b85e1ee029aa5974e174cabc6e49f097fb40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 12 Feb 2016 15:43:42 +0100 Subject: [PATCH] Avoid matching of date MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This causes random failures as time can be one second further when generating output. Signed-off-by: Michal Čihař --- test/libraries/PMA_ConfigGenerator_test.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/libraries/PMA_ConfigGenerator_test.php b/test/libraries/PMA_ConfigGenerator_test.php index 63ae7d2b5b..1d0d2f1959 100644 --- a/test/libraries/PMA_ConfigGenerator_test.php +++ b/test/libraries/PMA_ConfigGenerator_test.php @@ -45,8 +45,6 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase $cf->setPersistKeys(array("1/", 2)); - /* TODO: This is sometimes one second off... */ - $date = date(DATE_RFC1123); $result = ConfigGenerator::getConfigFile($cf); $this->assertContains( @@ -54,9 +52,7 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase "/*\n" . " * Generated configuration file\n" . " * Generated by: phpMyAdmin " . - $GLOBALS['PMA_Config']->get('PMA_VERSION') . " setup script\n" . - " * Date: " . $date . "\n" . - " */\n\n", + $GLOBALS['PMA_Config']->get('PMA_VERSION') . " setup script\n", $result );