Skip to content

Fix timeout tests #4969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix timeout tests #4969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions tests/basic/timeout_variation_0.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
Timeout within while loop
--SKIPIF--
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
?>
--FILE--
<?php

include __DIR__ . DIRECTORY_SEPARATOR . "timeout_config.inc";
set_time_limit(1);

set_time_limit($t);

while (1) {
busy_wait(1);
$x = true;
$y = 0;
while ($x) {
$y++;
}

?>
never reached here
--EXPECTF--
Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
19 changes: 6 additions & 13 deletions tests/basic/timeout_variation_1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,18 @@
Timeout within function
--SKIPIF--
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (PHP_OS_FAMILY !== "Windows") die("skip Windows only test");
?>
--FILE--
<?php

include __DIR__ . DIRECTORY_SEPARATOR . "timeout_config.inc";

set_time_limit($t);

function hello ($t) {
echo "call";
busy_wait($t*2);
}

hello($t);
set_time_limit(1);

sleep(1);
sleep(1);

?>
never reached here
--EXPECTF--
call
Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
21 changes: 6 additions & 15 deletions tests/basic/timeout_variation_10.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,19 @@
Timeout within shutdown function, variation
--SKIPIF--
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (PHP_OS_FAMILY !== "Windows") die("skip Windows only test");
?>
--FILE--
<?php

include __DIR__ . DIRECTORY_SEPARATOR . "timeout_config.inc";
set_time_limit(1);

set_time_limit($t);
register_shutdown_function("sleep", 1);
register_shutdown_function("sleep", 1);

function f()
{
echo "call";
$startTime = microtime(true);
busy_wait(5);
$diff = microtime(true) - $startTime;
echo "\ntime spent waiting: $diff\n";
}

register_shutdown_function("f");
?>
shutdown happens after here
--EXPECTF--
shutdown happens after here
call
Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
24 changes: 7 additions & 17 deletions tests/basic/timeout_variation_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,19 @@
--TEST--
Timeout within array_walk
Timeout within array_map
--SKIPIF--
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (PHP_OS_FAMILY !== "Windows") die("skip Windows only test");
?>
--FILE--
<?php

include __DIR__ . DIRECTORY_SEPARATOR . "timeout_config.inc";
set_time_limit(1);

set_time_limit($t);
$a = array(1, 1);
array_map("sleep", $a);

function cb(&$i, $k, $p)
{
busy_wait(1);
}

$startTime = microtime(true);

$a = array(1 => 1, 2 => 1, 3 => 1, 4 => 1, 5 => 1, 6 => 1, 7 => 1);
array_walk($a, "cb", "junk");

$diff = microtime(true) - $startTime;
echo "time spent waiting: $diff\n";
?>
never reached here
--EXPECTF--
Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
28 changes: 0 additions & 28 deletions tests/basic/timeout_variation_3.phpt
View file
Open in desktop

This file was deleted.

22 changes: 6 additions & 16 deletions tests/basic/timeout_variation_4.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,18 @@
Timeout within call_user_func
--SKIPIF--
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (PHP_OS_FAMILY !== "Windows") die("skip Windows only test");
?>
--FILE--
<?php

include __DIR__ . DIRECTORY_SEPARATOR . "timeout_config.inc";
set_time_limit(1);

set_time_limit($t);

function hello ($t) {
echo "call", PHP_EOL;
$startTime = microtime(true);
busy_wait($t*2);
$diff = microtime(true) - $startTime;
echo "time spent waiting: $diff\n";
}

call_user_func('hello', $t);
call_user_func('sleep', 1);
call_user_func('sleep', 1);

?>
never reached here
--EXPECTF--
call

Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
27 changes: 0 additions & 27 deletions tests/basic/timeout_variation_5.phpt
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions tests/basic/timeout_variation_6.phpt
View file
Open in desktop

This file was deleted.

18 changes: 6 additions & 12 deletions tests/basic/timeout_variation_7.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,19 @@
Timeout within for loop
--SKIPIF--
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
?>
--FILE--
<?php

include __DIR__ . DIRECTORY_SEPARATOR . "timeout_config.inc";
set_time_limit(1);

set_time_limit($t);

$startTime = microtime(true);

for ($i = 0; $i < 42; $i++) {
busy_wait(1);
$y = 0;
for ($i = 0; $i < INF; $i++) {
$y++;
}

$diff = microtime(true) - $startTime;
echo "time spent waiting: $diff\n";

?>
never reached here
--EXPECTF--
Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
16 changes: 4 additions & 12 deletions tests/basic/timeout_variation_8.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,17 @@
Timeout within foreach loop
--SKIPIF--
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
?>
--FILE--
<?php

include __DIR__ . DIRECTORY_SEPARATOR . "timeout_config.inc";
set_time_limit(1);

set_time_limit($t);

$startTime = microtime(true);

foreach (range(0, 42) as $i) {
busy_wait(1);
foreach (new InfiniteIterator(new ArrayIterator([1])) as $i) {
}

$diff = microtime(true) - $startTime;
echo "time spent waiting: $diff\n";

?>
never reached here
--EXPECTF--
Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
22 changes: 6 additions & 16 deletions tests/basic/timeout_variation_9.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,18 @@
Timeout within shutdown function
--SKIPIF--
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (PHP_OS_FAMILY !== "Windows") die("skip Windows only test");
?>
--FILE--
<?php

include __DIR__ . DIRECTORY_SEPARATOR . "timeout_config.inc";
set_time_limit(1);
register_shutdown_function("sleep", 1);
register_shutdown_function("sleep", 1);

set_time_limit($t);

function f()
{
echo "call";
$startTime = microtime(true);
busy_wait(5);
$diff = microtime(true) - $startTime;
echo "\ntime spent waiting: $diff\n";
}

register_shutdown_function("f");
exit(0);
?>
never reached here
--EXPECTF--
call
Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d