wharmby Thu Jan 8 10:39:50 2009 UTC
Modified files:
/php-src/ext/standard/tests/file rename_basic.phpt
lstat_stat_variation3.phpt
Log:
Fix bogus file tests - addresses 2 failures in PHP GCOV reports. Tested on
Windows, Linux and Linux 64 bit
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_basic.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/file/rename_basic.phpt
diff -u php-src/ext/standard/tests/file/rename_basic.phpt:1.5
php-src/ext/standard/tests/file/rename_basic.phpt:1.6
--- php-src/ext/standard/tests/file/rename_basic.phpt:1.5 Wed Nov 26
17:48:40 2008
+++ php-src/ext/standard/tests/file/rename_basic.phpt Thu Jan 8 10:39:50 2009
@@ -8,29 +8,30 @@
echo "*** Testing rename() on non-existing file ***\n";
$file_path = dirname(__FILE__);
+require "$file_path/file.inc";
+
$src_name = "$file_path/rename_basic.tmp";
$dest_name = "$file_path/rename_basic_new.tmp";
// create the file
$fp = fopen($src_name, "w");
-$s1 = stat($src_name);
+$old_stat = stat($src_name);
fclose($fp);
var_dump( rename($src_name, $dest_name) ); // expecting true
var_dump( file_exists($src_name) ); // expecting false
var_dump( file_exists($dest_name) ); // expecting true
-$s2 = stat("$file_path/rename_basic_new.tmp");
+$new_stat = stat("$file_path/rename_basic_new.tmp");
-// checking statistics of old and renamed file - both should be same
-for ($i = 0; $i <= 12; $i++) {
- if ($s1[$i] != $s2[$i]) {
- echo "rename_basic.tmp and rename_basic_new.tmp stat differ at element
$i\n";
- }
-}
+// checking statistics of old and renamed file - both should be same except
ctime
+$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12,
+ "dev", "ino", "mode", "nlink", "uid", "gid",
+ "rdev", "size", "atime", "mtime", "blksize", "blocks");
+var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
-echo "Done\n";
?>
+===Done===
--CLEAN--
<?php
unlink(dirname(__FILE__)."/rename_basic.tmp");
@@ -41,5 +42,6 @@
bool(true)
bool(false)
bool(true)
-Done
+bool(true)
+===Done===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_variation3.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/file/lstat_stat_variation3.phpt
diff -u php-src/ext/standard/tests/file/lstat_stat_variation3.phpt:1.3
php-src/ext/standard/tests/file/lstat_stat_variation3.phpt:1.4
--- php-src/ext/standard/tests/file/lstat_stat_variation3.phpt:1.3 Tue May
27 09:34:54 2008
+++ php-src/ext/standard/tests/file/lstat_stat_variation3.phpt Thu Jan 8
10:39:50 2009
@@ -40,12 +40,13 @@
var_dump( compare_self_stat($old_stat) );
var_dump( compare_self_stat($new_stat) );
-// compare the two stats
-var_dump( compare_stats($old_stat, $new_stat, $all_stat_keys) );
-
-echo "\n--- Done ---";
+// compare the two stats - all except ctime
+$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12,
+ "dev", "ino", "mode", "nlink", "uid", "gid",
+ "rdev", "size", "atime", "mtime", "blksize", "blocks");
+var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
?>
-
+===Done===
--CLEAN--
<?php
$file_path = dirname(__FILE__);
@@ -58,5 +59,4 @@
bool(true)
bool(true)
bool(true)
-
---- Done ---
+===Done===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
