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