Index: PEAR_Command/test_registerCommands_standard.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Command/test_registerCommands_standard.phpt,v retrieving revision 1.26 diff -u -r1.26 test_registerCommands_standard.phpt --- PEAR_Command/test_registerCommands_standard.phpt 17 Feb 2007 05:39:35 -0000 1.26 +++ PEAR_Command/test_registerCommands_standard.phpt 23 May 2007 19:29:42 -0000 @@ -266,8 +266,8 @@ $phpunit->assertEquals('', $s, 'short shell-test'); $phpunit->assertEquals(array (), $l, 'long shell-test'); PEAR_Command::getGetoptArgs('sign', $s, $l); -$phpunit->assertEquals('', $s, 'short sign'); -$phpunit->assertEquals(array (), $l, 'long sign'); +$phpunit->assertEquals('v', $s, 'short sign'); +$phpunit->assertEquals(array(0 => 'verbose',), $l, 'long sign'); PEAR_Command::getGetoptArgs('uninstall', $s, $l); $phpunit->assertEquals('nrR:O', $s, 'short uninstall'); $phpunit->assertEquals(array ( @@ -281,7 +281,7 @@ $phpunit->assertEquals('', $s, 'short update-channels'); $phpunit->assertEquals(array (), $l, 'long update-channels'); PEAR_Command::getGetoptArgs('upgrade', $s, $l); -$phpunit->assertEquals('flnrBZR:P:aoOp', $s, 'short upgrade'); +$phpunit->assertEquals('flnrBZR:aoOp', $s, 'short upgrade'); $phpunit->assertEquals(array ( 0 => 'force', 1 => 'loose', @@ -290,12 +290,11 @@ 4 => 'nobuild', 5 => 'nocompress', 6 => 'installroot=', - 7 => 'packagingroot=', - 8 => 'ignore-errors', - 9 => 'alldeps', - 10 => 'onlyreqdeps', - 11 => 'offline', - 12 => 'pretend', + 7 => 'ignore-errors', + 8 => 'alldeps', + 9 => 'onlyreqdeps', + 10 => 'offline', + 11 => 'pretend', ), $l, 'long upgrade'); PEAR_Command::getGetoptArgs('upgrade-all', $s, $l); $phpunit->assertEquals('nrBZR:', $s, 'short upgrade-all'); Index: PEAR_Command_Channels/channel-discover/test_fail.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Command_Channels/channel-discover/test_fail.phpt,v retrieving revision 1.3 diff -u -r1.3 test_fail.phpt --- PEAR_Command_Channels/channel-discover/test_fail.phpt 2 Mar 2006 18:14:13 -0000 1.3 +++ PEAR_Command_Channels/channel-discover/test_fail.phpt 23 May 2007 19:29:43 -0000 @@ -25,7 +25,7 @@ ), 'pear'); $e = $command->run('channel-discover', array(), array('zornk.net')); $phpunit->assertErrors(array( - array('package' => 'PEAR_Error', 'message' => 'Discovery of channel "zornk.net" failed (channel-add: Cannot open "http://zornk.net/channel.xml")'), + array('package' => 'PEAR_Error', 'message' => 'Discovery of channel "zornk.net" failed (channel-add: Cannot open "http://zornk.net/channel.xml" (File http://zornk.net:80/channel.xml not valid (received: HTTP/1.1 404 http://zornk.net/channel.xml Is not valid)))'), ), 'zornk'); echo 'tests done'; ?> Index: PEAR_Command_Channels/channel-info/test_remotefilefail.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Command_Channels/channel-info/test_remotefilefail.phpt,v retrieving revision 1.2 diff -u -r1.2 test_remotefilefail.phpt --- PEAR_Command_Channels/channel-info/test_remotefilefail.phpt 3 Feb 2006 05:05:12 -0000 1.2 +++ PEAR_Command_Channels/channel-info/test_remotefilefail.phpt 23 May 2007 19:29:43 -0000 @@ -12,7 +12,7 @@ require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'setup.php.inc'; $e = $command->run('channel-info', array(), array('http://pear.php.net/remotechannel.xml')); $phpunit->assertErrors(array( - array('package' => 'PEAR_Error', 'message' => 'Cannot open "http://pear.php.net/remotechannel.xml"'), + array('package' => 'PEAR_Error', 'message' => 'Cannot open "http://pear.php.net/remotechannel.xml" (File http://pear.php.net:80/remotechannel.xml not valid (received: HTTP/1.1 404 http://pear.php.net/remotechannel.xml Is not valid))'), ), '1'); $phpunit->showall(); $phpunit->assertEquals(array ( @@ -24,4 +24,4 @@ require_once dirname(dirname(__FILE__)) . '/teardown.php.inc'; ?> --EXPECT-- -tests done \ No newline at end of file +tests done Index: PEAR_Command_Channels/update-channels/test.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Command_Channels/update-channels/test.phpt,v retrieving revision 1.5 diff -u -r1.5 test.phpt --- PEAR_Command_Channels/update-channels/test.phpt 26 Mar 2007 19:36:57 -0000 1.5 +++ PEAR_Command_Channels/update-channels/test.phpt 23 May 2007 19:29:43 -0000 @@ -55,7 +55,7 @@ ), 3 => array ( - 'info' => 'Cannot retrieve channel.xml for channel "pecl.php.net"', + 'info' => 'Cannot retrieve channel.xml for channel "pecl.php.net" (File http://pecl.php.net:80/channel.xml not valid (received: HTTP/1.1 404 http://pecl.php.net/channel.xml Is not valid))', 'cmd' => 'update-channels', ), 4 => Index: PEAR_PackageFile_v2_Validator/test_phprelease.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_PackageFile_v2_Validator/test_phprelease.phpt,v retrieving revision 1.4 diff -u -r1.4 test_phprelease.phpt --- PEAR_PackageFile_v2_Validator/test_phprelease.phpt 17 Feb 2007 05:39:36 -0000 1.4 +++ PEAR_PackageFile_v2_Validator/test_phprelease.phpt 23 May 2007 19:29:59 -0000 @@ -35,8 +35,8 @@ $phpunit->assertIsa('PEAR_PackageFile_v2', $pf, 'ret'); $pf->validate(); $phpunit->assertErrorsF(array( - array('package' => 'PEAR_PackageFile_v2', 'message' => 'File "1" in directory "" has invalid role "src", should be one of data, doc, php, script, test%s'), - array('package' => 'PEAR_PackageFile_v2', 'message' => 'File "6" in directory "" has invalid role "ext", should be one of data, doc, php, script, test%s'), + array('package' => 'PEAR_PackageFile_v2', 'message' => 'File "1" in directory "" has invalid role "src", should be one of data, doc, php, script, test'), + array('package' => 'PEAR_PackageFile_v2', 'message' => 'File "6" in directory "" has invalid role "ext", should be one of data, doc, php, script, test'), ), '3'); echo 'tests done'; ?> @@ -45,4 +45,4 @@ require_once dirname(__FILE__) . '/teardown.php.inc'; ?> --EXPECT-- -tests done \ No newline at end of file +tests done