Index: test.phpt
===================================================================
RCS file: /repository/pear-core/tests/PEAR_Command_Remote/search/test.phpt,v
retrieving revision 1.3
diff -u -r1.3 test.phpt
--- test.phpt	3 Feb 2006 04:51:44 -0000	1.3
+++ test.phpt	25 May 2007 14:28:07 -0000
@@ -96,12 +97,13 @@
   ),
 ), $fakelog->getLog(), 'log after');
 $e = $command->run('search', array(), array('XZ'));
-$phpunit->assertErrors(array (
+$phpunit->assertEquals(array (
+  0 => 
   array (
-    'package' => 'PEAR_Error',
-    'message' => 'no packages found that match pattern "XZ"',
+    'info' => 'no packages found that match pattern "XZ", for channel pear.php.net.',
+    'cmd' => 'no command',
   ),
-), 'errors');
+), $fakelog->getLog(), 'log notfound');
 echo 'tests done';
 ?>
 --CLEAN--
Index: test_registerCommands_standard.phpt
===================================================================
RCS file: /repository/pear-core/tests/PEAR_Command/test_registerCommands_standard.phpt,v
retrieving revision 1.27
diff -u -r1.27 test_registerCommands_standard.phpt
--- test_registerCommands_standard.phpt	24 May 2007 21:00:09 -0000	1.27
+++ test_registerCommands_standard.phpt	25 May 2007 14:51:18 -0000
@@ -260,8 +260,8 @@
     'tapoutput',
     'cgi='), $l, 'long run-tests');
 PEAR_Command::getGetoptArgs('search', $s, $l);
-$phpunit->assertEquals('c:', $s, 'short search'); 
-$phpunit->assertEquals(array ('channel='), $l, 'long search');
+$phpunit->assertEquals('c:a', $s, 'short search'); 
+$phpunit->assertEquals(array ('channel=', 'allchannels'), $l, 'long search');
 PEAR_Command::getGetoptArgs('shell-test', $s, $l);
 $phpunit->assertEquals('', $s, 'short shell-test'); 
 $phpunit->assertEquals(array (), $l, 'long shell-test');