Skip to content

Commit fc99e89

Browse files
committed
Fix slowest tests
1 parent 0f89d40 commit fc99e89

21 files changed

+59
-37
lines changed

ext/standard/tests/file/005_variation-win32.phpt

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ function stat_fn( $filename ) {
4040
echo "-- inode change time is => ";
4141
print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n";
4242
clearstatcache();
43-
4443
}
4544

4645
echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n";
@@ -49,12 +48,12 @@ $file_path = __DIR__;
4948
$file_handle = fopen("$file_path/005_variation1.tmp", "w");
5049
fclose($file_handle);
5150
stat_fn("$file_path/005_variation1.tmp");
52-
sleep(2);
51+
sleep(1);
5352

5453
$file_handle = fopen("$file_path/005_variation2.tmp", "w");
5554
fclose($file_handle);
5655
stat_fn("$file_path/005_variation2.tmp");
57-
sleep(2);
56+
sleep(1);
5857

5958
$file_handle = fopen("$file_path/005_variation3.tmp", "w");
6059
fclose($file_handle);
@@ -70,64 +69,76 @@ $file_name = "$file_path/005_variation1.tmp";
7069
$file_write_handle = fopen($file_name, "w");
7170
fclose($file_write_handle);
7271
stat_fn($file_name);
73-
sleep(2);
72+
sleep(1);
7473

7574
/* filectime + 2 */
7675
echo "\n-- Checking different times, after changing the file permission --\n";
7776
chmod($file_name, 0777);
7877
stat_fn($file_name);
79-
sleep(2);
78+
sleep(1);
8079

8180
/* filemtime + 2 & filectime + 2 */
8281
echo "\n-- Checking different times, after writing into the file --\n";
8382
$file_write_handle = fopen($file_name, "w");
8483
fwrite($file_write_handle, "Hello, world");
8584
fclose($file_write_handle);
8685
stat_fn($file_name);
87-
sleep(2);
86+
sleep(1);
8887

8988
/* fileatime + 2 */
9089
echo "\n-- Checking different times, after reading from the file --\n";
9190
$file_read_handle = fopen($file_name ,"r");
9291
fread($file_read_handle, 10);
9392
fclose( $file_read_handle);
9493
stat_fn($file_name);
95-
sleep(2);
94+
sleep(1);
95+
96+
/* No change */
97+
echo "\n-- Checking same times, after creating a softlink to the file --\n";
98+
symlink($file_name, "$file_path/005_variation_softlink.tmp");
99+
stat_fn($file_name);
100+
sleep(1);
101+
102+
/* filectime + 2 */
103+
echo "\n-- Checking different times, after creating a hardlink to the file --\n";
104+
link($file_name, "$file_path/005_variation_hardlink.tmp");
105+
stat_fn($file_name);
106+
sleep(1);
96107

97108
/* No change */
98-
echo "\n-- Checking different times, after making a copy of the file --\n";
109+
echo "\n-- Checking same times, after making a copy of the file --\n";
99110
$file_copy = "$file_path/005_variation_copy.tmp";
100111
copy($file_name, $file_copy);
101112
stat_fn($file_name);
102-
sleep(2);
113+
sleep(1);
103114

104115
/* fileatime + 2 */
105116
echo "\n-- Checking different times, after performing is_file() operation on the file --\n";
106117
is_file($file_name);
107118
stat_fn($file_name);
108-
sleep(2);
119+
sleep(1);
109120

110121

111122
echo "\n*** Testing touch() function with different time values ***\n";
112123
$file_name2 = $file_path."/005_variation_touch.tmp";
113124
$file_handle = fopen($file_name2, "w");
114125
fclose($file_handle);
115-
sleep(2);
126+
sleep(1);
116127

117128
/* Time is not mentioned */
118129
var_dump( touch($file_name2) ); //set to current system time
119130
stat_fn($file_name2);
120-
sleep(2);
131+
sleep(1);
121132

122133
/* set to access(creation time of the file) time */
123134
var_dump( touch($file_name2, @date(fileatime($file_name2))) );
124135
stat_fn($file_name2);
125-
sleep(2);
136+
sleep(1);
126137

127138
/* set to access time of $file_name2 */
128139
var_dump( touch($file_path."/005_variation_touch_fly.tmp", @date(fileatime($file_name2)), time()) );
129140
stat_fn($file_name2);
130-
sleep(2);
141+
sleep(1);
131142

132143
/* set to default value, with Invalid timestamps */
133144
var_dump( touch($file_name2, 10) );
@@ -184,7 +195,17 @@ unlink($file_path."/005_variation_touch_new.tmp");
184195
-- File modification time is => %d:%s:%s:%d:%d:%d
185196
-- inode change time is => %d:%s:%s:%d:%d:%d
186197

187-
-- Checking different times, after making a copy of the file --
198+
-- Checking same times, after creating a softlink to the file --
199+
-- File access time is => %d:%s:%s:%d:%d:%d
200+
-- File modification time is => %d:%s:%s:%d:%d:%d
201+
-- inode change time is => %d:%s:%s:%d:%d:%d
202+
203+
-- Checking different times, after creating a hardlink to the file --
204+
-- File access time is => %d:%s:%s:%d:%d:%d
205+
-- File modification time is => %d:%s:%s:%d:%d:%d
206+
-- inode change time is => %d:%s:%s:%d:%d:%d
207+
208+
-- Checking same times, after making a copy of the file --
188209
-- File access time is => %d:%s:%s:%d:%d:%d
189210
-- File modification time is => %d:%s:%s:%d:%d:%d
190211
-- inode change time is => %d:%s:%s:%d:%d:%d

ext/standard/tests/file/lstat_stat_variation10.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ echo "*** Testing stat() on directory after using is_dir() on it ***\n";
3131
$old_stat = stat($dirname);
3232
// clear the cache
3333
clearstatcache();
34-
sleep(2);
34+
sleep(1);
3535
var_dump( is_dir($dirname) );
3636
$new_stat = stat($dirname);
3737

ext/standard/tests/file/lstat_stat_variation11.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ echo "*** Testing stat() on a file after using is_file() on it ***\n";
3131
$old_stat = stat($filename);
3232
// clear the stat
3333
clearstatcache();
34-
sleep(2);
34+
sleep(1);
3535
var_dump( is_file($filename) );
3636
$new_stat = stat($filename);
3737
// compare self stats

ext/standard/tests/file/lstat_stat_variation12.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $linkname = "$file_path/lstat_stat_variation12_link.tmp";
3636
$old_stat = lstat($linkname);
3737
// clear the stat
3838
clearstatcache();
39-
sleep(2);
39+
sleep(1);
4040
var_dump( is_link($linkname) );
4141
$new_stat = lstat($linkname);
4242
// compare self stats

ext/standard/tests/file/lstat_stat_variation13.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fclose($file_handle);
3030
$old_stat = stat($filename);
3131
// clear the stat
3232
clearstatcache();
33-
sleep(2);
33+
sleep(1);
3434
// opening file again in read mode
3535
$file_handle = fopen($filename, "r"); // read file
3636
fclose($file_handle);

ext/standard/tests/file/lstat_stat_variation16.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fclose($fp);
2828
// checking stat() on file after changing its permission
2929
echo "*** Testing lstat() on a file after changing its access permission ***\n";
3030
$old_stat = stat($filename);
31-
sleep(2);
31+
sleep(1);
3232
var_dump( chmod($filename, 0777) );
3333
// clear the stat
3434
clearstatcache();

ext/standard/tests/file/lstat_stat_variation17.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ $dirname = "$file_path/lstat_stat_variation17";
2727
mkdir($dirname);
2828

2929
$old_stat = stat($dirname);
30-
sleep(2);
30+
sleep(1);
3131
var_dump( chmod($dirname, 0777) );
3232
// clear the stat
3333
clearstatcache();

ext/standard/tests/file/lstat_stat_variation21.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ echo "*** Testing stat() on file by truncating it to given size ***\n";
3333
$old_stat = stat($filename);
3434
// clear the cache
3535
clearstatcache();
36-
sleep(2);
36+
sleep(1);
3737
// opening file in r/w mode
3838
$file_handle = fopen($filename, "r+");
3939
var_dump( ftruncate($file_handle, 512) ); // truncate it

ext/standard/tests/file/lstat_stat_variation4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ echo "*** Testing stat() for file after using touch() on the file ***\n";
3333
$old_stat = stat($file_name);
3434
// clear the cache
3535
clearstatcache();
36-
sleep(2);
36+
sleep(1);
3737
var_dump( touch($file_name) );
3838
$new_stat = stat($file_name);
3939

ext/standard/tests/file/lstat_stat_variation5.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ echo "*** Testing stat() for directory after using touch() on the directory ***\
3333
$old_stat = stat($dir_name);
3434
// clear the cache
3535
clearstatcache();
36-
sleep(2);
36+
sleep(1);
3737
var_dump( touch($dir_name) );
3838
$new_stat = stat($dir_name);
3939

ext/standard/tests/file/lstat_stat_variation8.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ echo "*** Testing stat() on dir after subdir and file is created in it ***\n";
3030
$dirname = "$file_path/lstat_stat_variation8";
3131
$old_stat = stat($dirname);
3232
clearstatcache();
33-
sleep(2);
33+
sleep(1);
3434
mkdir("$dirname/lstat_stat_variation8_subdir");
3535
$file_handle = fopen("$dirname/lstat_stat_variation8a.tmp", "w");
3636
fclose($file_handle);

ext/standard/tests/file/stat_basic-win32-mb.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ mkdir($dirname);
2626
// stat of the dir created
2727
$dir_stat = stat($dirname);
2828
clearstatcache();
29-
sleep(2);
29+
sleep(1);
3030

3131
// creating file
3232
$filename = "$dirname/stat_basic_私はガラスを食べられます.tmp";
3333
$file_handle = fopen($filename, "w");
3434
fclose($file_handle);
3535
// stat of the file created
3636
$file_stat = stat($filename);
37-
sleep(2);
37+
sleep(1);
3838

3939
// now new stat of the dir after file is created
4040
$new_dir_stat = stat($dirname);

ext/standard/tests/file/stat_basic-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ $file_handle = fopen($filename, "w");
3434
fclose($file_handle);
3535
// stat of the file created
3636
$file_stat = stat($filename);
37-
sleep(2);
37+
sleep(1);
3838

3939
// now new stat of the dir after file is created
4040
$new_dir_stat = stat($dirname);

ext/standard/tests/file/stat_variation1-win32-mb.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ $old_filename = "$file_path/stat_variation1_私はガラスを食べられます
3535
$new_filename = "$file_path/stat_variation1a_私はガラスを食べられます.tmp";
3636
$old_stat = stat($old_filename);
3737
clearstatcache();
38-
sleep(2);
38+
sleep(1);
3939
var_dump( rename($old_filename, $new_filename) );
4040
$new_stat = stat($new_filename);
4141

ext/standard/tests/file/stat_variation1-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ $old_filename = "$file_path/stat_variation1.tmp";
3535
$new_filename = "$file_path/stat_variation1a.tmp";
3636
$old_stat = stat($old_filename);
3737
clearstatcache();
38-
sleep(2);
38+
sleep(1);
3939
var_dump( rename($old_filename, $new_filename) );
4040
$new_stat = stat($new_filename);
4141

ext/standard/tests/file/stat_variation2-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ echo "*** Testing stat(): writing to a file ***\n";
3232
echo "-- Testing stat() on file after data is written in it --\n";
3333
$old_stat = stat($filename);
3434
clearstatcache();
35-
sleep(2);
35+
sleep(1);
3636
$file_handle = fopen($filename, "w"); // temp file
3737
fwrite($file_handle, "Hello World");
3838
fclose($file_handle);

ext/standard/tests/file/stat_variation3-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ echo "-- Testing stat() on dir after subdir and file is created in it --\n";
3030
$dirname = "$file_path/stat_variation3";
3131
$old_stat = stat($dirname);
3232
clearstatcache();
33-
sleep(2);
33+
sleep(1);
3434
mkdir("$dirname/stat_variation3_subdir");
3535
$file_handle = fopen("$dirname/stat_variation3a.tmp", "w");
3636
fclose($file_handle);

ext/standard/tests/file/stat_variation4-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $old_dirname = "$file_path/stat_variation4";
3636
$old_stat = stat($old_dirname);
3737
// clear the cache
3838
clearstatcache();
39-
sleep(2);
39+
sleep(1);
4040
var_dump( is_dir($old_dirname) );
4141
$new_stat = stat($old_dirname);
4242

ext/standard/tests/file/stat_variation5-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fclose($file_handle);
3232
$old_stat = stat($filename);
3333
// clear the stat
3434
clearstatcache();
35-
sleep(2);
35+
sleep(1);
3636
// opening file again in read mode
3737
$file_handle = fopen($filename, "r"); // read file
3838
fclose($file_handle);

ext/standard/tests/file/stat_variation6-win32.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ fclose($file_handle);
3232

3333
// checking stat() on file
3434
echo "\n*** Testing stat() on file with miscellaneous file permission and content ***\n";
35+
clearstatcache();
3536
$old_stat = stat($filename);
37+
sleep(1);
3638
var_dump( chmod($filename, 0777) );
3739
// clear the stat
3840
clearstatcache();
39-
sleep(2);
4041
$new_stat = stat($filename);
4142
// compare self stats
4243
var_dump( compare_self_stat($old_stat) );
@@ -50,10 +51,10 @@ clearstatcache(); // clear statement cache
5051
// checking stat() on directory
5152
echo "\n*** Testing stat() on directory with miscellaneous file permission ***\n";
5253
$old_stat = stat($dirname);
54+
sleep(1);
5355
var_dump( chmod($dirname, 0777) );
5456
// clear the stat
5557
clearstatcache();
56-
sleep(2);
5758
$new_stat = stat($dirname);
5859
// compare self stats
5960
var_dump( compare_self_stat($old_stat) );

ext/standard/tests/file/stat_variation8-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fclose($file_handle);
3737
clearstatcache(true, $filename);
3838
$old_stat = stat($filename);
3939
// clear the cache
40-
sleep(2);
40+
sleep(1);
4141

4242
// opening file in r/w mode
4343
$file_handle = fopen($filename, "r+");

0 commit comments

Comments
 (0)