danog/amp
1
0
Fork 0
mirror of https://github.com/danog/amp.git synced 2025-01-22 05:11:42 +01:00
Code Issues Projects Releases Wiki Activity

minor timeout function/test cleanup

Browse Source
This commit is contained in:
Daniel Lowrey 2015-05-31 20:18:42 -04:00
parent 34088cbf52
commit e923ea3fde
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/functions.php
View File

@ -448,7 +448,6 @@ function timeout(Promise $promise, $msTimeout, Reactor $reactor = null) {
if ($resolved) { if ($resolved) {
return; return;
} }
$reactor->cancel($watcherId); $reactor->cancel($watcherId);
if ($error) { if ($error) {
$promisor->fail($error); $promisor->fail($error);

2
test/FunctionsTest.php
View File

@ -167,7 +167,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
* @expectedExceptionMessage Promise resolution timed out * @expectedExceptionMessage Promise resolution timed out
*/ */
public function testTimeout() { public function testTimeout() {
(new NativeReactor)->run(function($reactor) use (&$invoked) { (new NativeReactor)->run(function($reactor) {
$pause = new \Amp\Pause(1000, $reactor); $pause = new \Amp\Pause(1000, $reactor);
yield \Amp\timeout($pause, 10, $reactor); yield \Amp\timeout($pause, 10, $reactor);
}); });