cvs: pear-core(PEAR_1_4) /tests/PEAR_Installer test_install_simplelocalpackage.phpt

pajoye          Tue Jun 20 02:50:21 2006 UTC

  Modified files:              (Branch: PEAR_1_4)
    /pear-core/tests/PEAR_Installer     
                                        test_install_simplelocalpackage.phpt 
  Log:
  - fix text
    Greg, this is what I explained about the tests failing with 1.4.10
  
  
http://cvs.php.net/viewvc.cgi/pear-core/tests/PEAR_Installer/test_install_simplelocalpackage.phpt?r1=1.4&r2=1.4.2.1&diff_format=u
Index: pear-core/tests/PEAR_Installer/test_install_simplelocalpackage.phpt
diff -u pear-core/tests/PEAR_Installer/test_install_simplelocalpackage.phpt:1.4 
pear-core/tests/PEAR_Installer/test_install_simplelocalpackage.phpt:1.4.2.1
--- pear-core/tests/PEAR_Installer/test_install_simplelocalpackage.phpt:1.4     
Fri Feb  3 04:31:48 2006
+++ pear-core/tests/PEAR_Installer/test_install_simplelocalpackage.phpt Tue Jun 
20 02:50:21 2006
@@ -30,14 +30,21 @@
 $phpunit->assertEquals('PEAR',
     $dlpackages[0]['pkg'], 'PEAR');
 $after = $dp->getDownloadedPackages();
+
 $phpunit->assertEquals(0, count($after), 'after getdp count');
-$phpunit->assertEquals(array (
-  0 => 
-  array (
-    0 => 3,
-    1 => '+ tmp dir created at ' . $dp->getDownloadDir(),
-  ),
-), $fakelog->getLog(), 'log messages');
+
+$dd_dir = $dp->getDownloadDir();
+if (!empty($dd_dir) && is_dir($dd_dir)) {
+       $phpunit->assertEquals(array (), $fakelog->getLog(), 'log messages');
+} else {
+       $phpunit->assertEquals(array (
+                               0 => 
+                               array (
+                                       0 => 3,
+                                       1 => '+ tmp dir created at ' . 
$dp->getDownloadDir(),
+                                       ),
+                               ), $fakelog->getLog(), 'log messages');
+}
 $phpunit->assertEquals(array (
 ), $fakelog->getDownload(), 'download callback messages');
 
@@ -223,4 +230,4 @@
 require_once dirname(__FILE__) . '/teardown.php.inc';
 ?>
 --EXPECT--
-tests done
\ No newline at end of file
+tests done

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php