[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests/tar rmdir.phpt /ext/phar/tests/zip rmdir.phpt

[Greg Beaver]

cellog          Sun Oct 12 23:32:51 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar/tests/tar rmdir.phpt 
    /php-src/ext/phar/tests/zip rmdir.phpt 
  Log:
  fix faulty tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/rmdir.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/phar/tests/tar/rmdir.phpt
diff -u php-src/ext/phar/tests/tar/rmdir.phpt:1.1.2.2 
php-src/ext/phar/tests/tar/rmdir.phpt:1.1.2.3
--- php-src/ext/phar/tests/tar/rmdir.phpt:1.1.2.2       Sun Jul 20 14:42:34 2008
+++ php-src/ext/phar/tests/tar/rmdir.phpt       Sun Oct 12 23:32:50 2008
@@ -23,6 +23,7 @@
 foreach ($files as $n => $file) {
        $tar->addFile($n, $file);
 }
+$tar->mkdir('a');
 
 $tar->close();
 
@@ -39,7 +40,7 @@
 --EXPECTF--
 a
 
-Warning: rmdir(): phar error: Directory not empty in %srmdir.php on line 24
+Warning: rmdir(): phar error: Directory not empty in %srmdir.php on line %d
 bool(false)
 a
 bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/rmdir.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/phar/tests/zip/rmdir.phpt
diff -u php-src/ext/phar/tests/zip/rmdir.phpt:1.1.2.2 
php-src/ext/phar/tests/zip/rmdir.phpt:1.1.2.3
--- php-src/ext/phar/tests/zip/rmdir.phpt:1.1.2.2       Sun Jul 20 14:42:34 2008
+++ php-src/ext/phar/tests/zip/rmdir.phpt       Sun Oct 12 23:32:50 2008
@@ -15,6 +15,7 @@
 $phar->setStub("<?php
 Phar::mapPhar('hio');
 __HALT_COMPILER(); ?>");
+$phar->addEmptyDir('a');
 $phar['a/x'] = 'a';
 $phar->stopBuffering();
 
@@ -31,7 +32,7 @@
 --EXPECTF--
 a
 
-Warning: rmdir(): phar error: Directory not empty in %srmdir.php on line 16
+Warning: rmdir(): phar error: Directory not empty in %srmdir.php on line %d
 bool(false)
 a
 bool(true)



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