cellog Sun Oct 12 23:33:08 2008 UTC
Modified files:
/php-src/ext/phar/tests/tar rmdir.phpt
/php-src/ext/phar/tests/zip rmdir.phpt
Log:
MFB: fix faulty tests
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/rmdir.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/phar/tests/tar/rmdir.phpt
diff -u php-src/ext/phar/tests/tar/rmdir.phpt:1.2
php-src/ext/phar/tests/tar/rmdir.phpt:1.3
--- php-src/ext/phar/tests/tar/rmdir.phpt:1.2 Fri Aug 1 13:36:19 2008
+++ php-src/ext/phar/tests/tar/rmdir.phpt Sun Oct 12 23:33:08 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.2&r2=1.3&diff_format=u
Index: php-src/ext/phar/tests/zip/rmdir.phpt
diff -u php-src/ext/phar/tests/zip/rmdir.phpt:1.2
php-src/ext/phar/tests/zip/rmdir.phpt:1.3
--- php-src/ext/phar/tests/zip/rmdir.phpt:1.2 Fri Aug 1 13:36:19 2008
+++ php-src/ext/phar/tests/zip/rmdir.phpt Sun Oct 12 23:33:08 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
