<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">2013/12/16 Marc Delisle <span dir="ltr"><<a href="mailto:marc@infomarc.info" target="_blank">marc@infomarc.info</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Le 2013-12-16 14:03, Hugues Peccatte a écrit :<br>
<div class="im">> Done.<br>
> I'm not very comfortable with git, so I used git GUI to revert the<br>
> changes of my branch. There is no Signed-Off-By, I hope this is good...<br>
<br>
</div>Hi Hugues,<br>
I don't think it's a big problem, as this revert does not contribute code.<br>
<div class="im"><br>
> But modifications are reverted and Jenkins isn't anymore in error.<br>
<br>
</div>Next time, you might want to try smaller commits which are easier to<br>
manage for the reviewers.<br>
<div class="im"><br>
><br>
> Hugues.<br>
><br>
><br>
> 2013/12/16 Hugues Peccatte <<a href="mailto:hugues.peccatte@gmail.com">hugues.peccatte@gmail.com</a><br>
</div>> <mailto:<a href="mailto:hugues.peccatte@gmail.com">hugues.peccatte@gmail.com</a>>><br>
<div class="im">><br>
> Hi,<br>
><br>
> It seems that there is an error with an error with my commit. I'm<br>
> looking for revert it.<br>
><br>
> Hugues.<br>
><br>
><br>
</div>> 2013/12/16 <<a href="mailto:michal@cihar.com">michal@cihar.com</a> <mailto:<a href="mailto:michal@cihar.com">michal@cihar.com</a>>><br>
<div><div class="h5">><br>
> See<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/4926/changes" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/4926/changes</a>><br>
><br>
> Changes:<br>
><br>
> [hugues.peccatte] PHPCS update.<br>
><br>
> ------------------------------------------<br>
> Started by GitHub push by Tithugues<br>
> Building in workspace<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/</a>><br>
> Checkout:workspace /<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/</a>> -<br>
> hudson.remoting.LocalChannel@732e02e4<br>
> Using strategy: Default<br>
> Last Built Revision: Revision<br>
> 2588725b029e70b04ca77dd338502f1307eb577d (origin/master)<br>
> Fetching changes from 1 remote Git repository<br>
> Fetching upstream changes from origin<br>
> Commencing build of Revision<br>
> 0488eca37a19db3f5b19b7d3c1d7743ce535ac04 (origin/master)<br>
> Checking out Revision 0488eca37a19db3f5b19b7d3c1d7743ce535ac04<br>
> (origin/master)<br>
> [workspace] $ /bin/sh -xe /tmp/hudson6668369921047036077.sh<br>
> + ./scripts/generate-mo --quiet<br>
> [workspace] $ ant clean phpunit-nocoverage phpcpd phpcs phploc<br>
> jshint<br>
> Unable to locate tools.jar. Expected to find it in<br>
> /usr/lib/jvm/java-7-openjdk-amd64/lib/tools.jar<br>
> Buildfile:<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build.xml" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build.xml</a>><br>
><br>
> clean:<br>
> [delete] Deleting directory<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/api" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/api</a>><br>
> [delete] Deleting directory<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/code-browser" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/code-browser</a>><br>
> [delete] Deleting directory<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/coverage" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/coverage</a>><br>
> [delete] Deleting directory<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/logs" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/logs</a>><br>
> [delete] Deleting directory<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/pdepend" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/pdepend</a>><br>
> [mkdir] Created dir:<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/api" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/api</a>><br>
> [mkdir] Created dir:<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/code-browser" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/code-browser</a>><br>
> [mkdir] Created dir:<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/coverage" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/coverage</a>><br>
> [mkdir] Created dir:<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/logs" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/logs</a>><br>
> [mkdir] Created dir:<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/pdepend" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build/pdepend</a>><br>
><br>
> phpunit-nocoverage:<br>
> [exec] Enabling headers testing...<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec]<br>
> [exec] PHPUnit 3.7.27 by Sebastian Bergmann.<br>
> [exec]<br>
> [exec] Configuration read from<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/phpunit.xml.nocoverage" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/phpunit.xml.nocoverage</a>><br>
> [exec]<br>
> [exec]<br>
> .............................................................<br>
> 61 / 2206 ( 2%)<br>
> [exec] [33;1mI [0m........................................<br>
> [33;1mI [0m................... 122 / 2206 ( 5%)<br>
> [exec] ...................................... [41;37mF<br>
> [0m...................... 183 / 2206 ( 8%)<br>
> [exec]<br>
> .............................................................<br>
> 244 / 2206 ( 11%)<br>
> [exec]<br>
> .............................................................<br>
> 305 / 2206 ( 13%)<br>
> [exec]<br>
> .............................................................<br>
> 366 / 2206 ( 16%)<br>
> [exec]<br>
> .............................................................<br>
> 427 / 2206 ( 19%)<br>
> [exec]<br>
> .............................................................<br>
> 488 / 2206 ( 22%)<br>
> [exec]<br>
> .............................................................<br>
> 549 / 2206 ( 24%)<br>
> [exec]<br>
> .............................................................<br>
> 610 / 2206 ( 27%)<br>
> [exec] ..............................................<br>
> [33;1mI [0m.............. 671 / 2206 ( 30%)<br>
> [exec]<br>
> .............................................................<br>
> 732 / 2206 ( 33%)<br>
> [exec]<br>
> .............................................................<br>
> 793 / 2206 ( 35%)<br>
> [exec]<br>
> .............................................................<br>
> 854 / 2206 ( 38%)<br>
> [exec] ....... [41;37mF [0m. [31;1mE<br>
> [0m................................................... 915 /<br>
> 2206 ( 41%)<br>
> [exec]<br>
> .............................................................<br>
> 976 / 2206 ( 44%)<br>
> [exec]<br>
> .............................................................<br>
> 1037 / 2206 ( 47%)<br>
> [exec]<br>
> .............................................................<br>
> 1098 / 2206 ( 49%)<br>
> [exec]<br>
> .............................................................<br>
> 1159 / 2206 ( 52%)<br>
> [exec]<br>
> .............................................................<br>
> 1220 / 2206 ( 55%)<br>
> [exec]<br>
> .............................................................<br>
> 1281 / 2206 ( 58%)<br>
> [exec]<br>
> .............................................................<br>
> 1342 / 2206 ( 60%)<br>
> [exec]<br>
> .............................................................<br>
> 1403 / 2206 ( 63%)<br>
> [exec]<br>
> .............................................................<br>
> 1464 / 2206 ( 66%)<br>
> [exec] ............................................ [31;1mE<br>
> [0m................ 1525 / 2206 ( 69%)<br>
> [exec]<br>
> .............................................................<br>
> 1586 / 2206 ( 71%)<br>
> [exec]<br>
> .............................................................<br>
> 1647 / 2206 ( 74%)<br>
> [exec]<br>
> .............................................................<br>
> 1708 / 2206 ( 77%)<br>
> [exec]<br>
> .............................................................<br>
> 1769 / 2206 ( 80%)<br>
> [exec]<br>
> .............................................................<br>
> 1830 / 2206 ( 82%)<br>
> [exec]<br>
> .............................................................<br>
> 1891 / 2206 ( 85%)<br>
> [exec]<br>
> .............................................................<br>
> 1952 / 2206 ( 88%)<br>
> [exec]<br>
> ..........................................................<br>
> [33;1mI [0m.. 2013 / 2206 ( 91%)<br>
> [exec]<br>
> ...................................................... [41;37mF<br>
> [0m [41;37mF [0m..... 2074 / 2206 ( 94%)<br>
> [exec]<br>
> .............................................................<br>
> 2135 / 2206 ( 96%)<br>
> [exec]<br>
> .............................................................<br>
> 2196 / 2206 ( 99%)<br>
> [exec] ......... [33;1mI [0m<br>
> [exec]<br>
> [exec] Time: 17.21 seconds, Memory: 108.25Mb<br>
> [exec]<br>
> [exec] There were 2 errors:<br>
> [exec]<br>
> [exec] 1) ImportShp_Test::testDoImport<br>
> [exec] PHPUnit_Framework_Exception: Argument #2 of<br>
> PHPUnit_Framework_Assert::assertContains() must be a array,<br>
> iterator or string<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/plugin/import/ImportShp_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/plugin/import/ImportShp_test.php</a>>:151<br>
> [exec]<br>
> [exec] 2) PMA_SetupIndex_Test::testPMAPerformConfigChecks<br>
> [exec] Undefined index: messages<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/libraries/PMA_SetupIndex_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/libraries/PMA_SetupIndex_test.php</a>>:505<br>
> [exec]<br>
> [exec] --<br>
> [exec]<br>
> [exec]<br>
> [exec] There were 4 failures:<br>
> [exec]<br>
> [exec] 1) PMA_File_Test::testContent with data set #2<br>
> ('./test/test_data/test.zip', 'application/zip')<br>
> [exec] Failed asserting that false is true.<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/PMA_File_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/PMA_File_test.php</a>>:64<br>
> [exec]<br>
> [exec] 2) ImportOds_Test::testDoImport<br>
> [exec] Failed asserting that 'CREATE DATABASE IF NOT EXISTS<br>
> `ODS_DB` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci'<br>
> contains "CREATE TABLE IF NOT EXISTS `ODS_DB`.`pma_bookmark`".<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/plugin/import/ImportOds_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/plugin/import/ImportOds_test.php</a>>:148<br>
> [exec]<br>
> [exec] 3) PMA_ZipExtension_Test::testGetZipContents with<br>
> data set #0 ('./test/test_data/test.zip', NULL, array('', 'TEST FILE<br>
> [exec] '))<br>
> [exec] Failed asserting that two arrays are equal.<br>
> [exec] --- Expected<br>
> [exec] +++ Actual<br>
> [exec] @@ @@<br>
> [exec] Array (<br>
> [exec] - 'error' => 'No files found inside ZIP archive!'<br>
> [exec] - 'data' => ''<br>
> [exec] + 'error' => ''<br>
> [exec] + 'data' => 'TEST FILE<br>
> [exec] + '<br>
> [exec] )<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/libraries/PMA_zip_extension_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/libraries/PMA_zip_extension_test.php</a>>:37<br>
> [exec]<br>
> [exec] 4) PMA_ZipExtension_Test::testGetZipContents with<br>
> data set #1 ('./test/test_data/test.zip', 'test', array('Error<br>
> in ZIP archive: Could not find "test"', ''))<br>
> [exec] Failed asserting that two arrays are equal.<br>
> [exec] --- Expected<br>
> [exec] +++ Actual<br>
> [exec] @@ @@<br>
> [exec] Array (<br>
> [exec] - 'error' => 'No files found inside ZIP archive!'<br>
> [exec] + 'error' => 'Error in ZIP archive: Could not<br>
> find "test"'<br>
> [exec] 'data' => ''<br>
> [exec] )<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/libraries/PMA_zip_extension_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/libraries/PMA_zip_extension_test.php</a>>:37<br>
> [exec]<br>
> [exec] --<br>
> [exec]<br>
> [exec]<br>
> [exec] There were 5 incomplete tests:<br>
> [exec]<br>
> [exec] 1) PMA_ConfigTest::testCheckPermissions<br>
> [exec] This test has not been implemented yet.<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/PMA_Config_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/PMA_Config_test.php</a>>:956<br>
> [exec]<br>
> [exec] 2) PMA_DisplayResults_Test::testGetTableNavigation<br>
> with data set #0 (21, 41, '123', false, '310')<br>
> [exec] Not yet implemented!<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/PMA_DisplayResults_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/PMA_DisplayResults_test.php</a>>:438<br>
> [exec]<br>
> [exec] 3) PMA_AuthenticationCookie_Test::testBlowfishDecrypt<br>
> [exec] Not testing mcrypt support<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php</a>>:1104<br>
> [exec]<br>
> [exec] 4)<br>
> PMA_TblColumnsDefinitionFormTest::testGetFormParamsForOldColumn<br>
> [exec] Not yet implemented!<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/libraries/PMA_tbl_columns_definition_form_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/libraries/PMA_tbl_columns_definition_form_test.php</a>>:1101<br>
> [exec]<br>
> [exec] 5) Environment_Test::testSession<br>
> [exec] No session testing<br>
> [exec]<br>
> [exec]<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/Environment_test.php" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/test/Environment_test.php</a>>:83<br>
> [exec]<br>
> [exec] [37;41m [2KFAILURES!<br>
> [exec] [0m [37;41m [2KTests: 2206, Assertions: 5342,<br>
> Failures: 4, Errors: 2, Incomplete: 5.<br>
> [exec] [0m [2K<br>
><br>
> BUILD FAILED<br>
> <<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build.xml" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/build.xml</a>>:30:<br>
> exec returned: 2<br>
><br>
> Total time: 18 seconds<br>
> Build step 'Invoke Ant' marked build as failure<br>
> [CHECKSTYLE] Skipping publisher since build result is FAILURE<br>
> [JSLINT] Skipping publisher since build result is FAILURE<br>
> [PMD] Skipping publisher since build result is FAILURE<br>
> [DRY] Collecting duplicate code analysis files...<br>
> [DRY] Finding all files that match the pattern<br>
> build/logs/pmd-cpd.xml<br>
> [DRY] Computing warning deltas based on reference build #4925<br>
> [TASKS] Skipping publisher since build result is FAILURE<br>
> [ANALYSIS-COLLECTOR] Computing warning deltas based on reference<br>
> build #4925<br>
> Recording plot data<br>
> [xUnit] [INFO] - Starting to record.<br>
> [xUnit] [INFO] - Processing PHPUnit-3.x (default)<br>
> [xUnit] [INFO] - [PHPUnit-3.x (default)] - 1 test report file(s)<br>
> were found with the pattern 'build/logs/junit.xml' relative to<br>
> '<<a href="http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/" target="_blank">http://ci.phpmyadmin.net/job/phpMyAdmin-continuous/ws/</a>'> for<br>
> the testing framework 'PHPUnit-3.x (default)'.<br>
> [xUnit] [INFO] - Check 'Failed Tests' threshold.<br>
> [xUnit] [INFO] - Check 'Skipped Tests' threshold.<br>
> [xUnit] [INFO] - Setting the build status to FAILURE<br>
> [xUnit] [INFO] - Stopping recording.<br>
><br>
> ------------------------------------------------------------------------------<br>
> Rapidly troubleshoot problems before they affect your business.<br>
> Most IT<br>
> organizations don't have a clear picture of how application<br>
> performance<br>
> affects their revenue. With AppDynamics, you get 100% visibility<br>
> into your<br>
> Java,.NET, & PHP application. Start your 15-day FREE TRIAL of<br>
> AppDynamics Pro!<br>
> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk</a><br>
> _______________________________________________<br>
> Phpmyadmin-devel mailing list<br>
> <a href="mailto:Phpmyadmin-devel@lists.sourceforge.net">Phpmyadmin-devel@lists.sourceforge.net</a><br>
</div></div>> <mailto:<a href="mailto:Phpmyadmin-devel@lists.sourceforge.net">Phpmyadmin-devel@lists.sourceforge.net</a>><br>
> <a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel</a><br>
<div class="im HOEnZb">><br>
><br>
><br>
><br>
><br>
> ------------------------------------------------------------------------------<br>
> Rapidly troubleshoot problems before they affect your business. Most IT<br>
> organizations don't have a clear picture of how application performance<br>
> affects their revenue. With AppDynamics, you get 100% visibility into your<br>
> Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!<br>
> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk</a><br>
><br>
><br>
><br>
> _______________________________________________<br>
> Phpmyadmin-devel mailing list<br>
> <a href="mailto:Phpmyadmin-devel@lists.sourceforge.net">Phpmyadmin-devel@lists.sourceforge.net</a><br>
> <a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel</a><br>
><br>
<br>
<br>
</div><span class="HOEnZb"><font color="#888888">--<br>
Marc Delisle<br>
<a href="http://infomarc.info" target="_blank">http://infomarc.info</a> | <a href="http://phpmyadmin.net" target="_blank">http://phpmyadmin.net</a><br>
</font></span><div class="HOEnZb"><div class="h5"><br>
------------------------------------------------------------------------------<br>
Rapidly troubleshoot problems before they affect your business. Most IT<br>
organizations don't have a clear picture of how application performance<br>
affects their revenue. With AppDynamics, you get 100% visibility into your<br>
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!<br>
<a href="http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk</a><br>
_______________________________________________<br>
Phpmyadmin-devel mailing list<br>
<a href="mailto:Phpmyadmin-devel@lists.sourceforge.net">Phpmyadmin-devel@lists.sourceforge.net</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel</a><br>
</div></div></blockquote></div><br></div><div class="gmail_extra"><br></div><div class="gmail_extra">Yes, I'll try to split my modifications and commit the most sensitive alone (not sure this is really english...).</div>
<div class="gmail_extra"><br></div><div class="gmail_extra">Thanks for your review and feedback !</div><div class="gmail_extra"><br>Hugues.</div></div>