Merge branch '2.3' into 2.7
* 2.3: [Process] Fix transient test on Windows
This commit is contained in:
commit
53b0d77419
@ -747,7 +747,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
}
|
}
|
||||||
$this->skipIfNotEnhancedSigchild(false);
|
$this->skipIfNotEnhancedSigchild(false);
|
||||||
|
|
||||||
$process = $this->getProcess(self::$phpBin.' -r "while (true) usleep(100);"');
|
$process = $this->getProcess(self::$phpBin.' -r "sleep(32.1)"');
|
||||||
$process->start();
|
$process->start();
|
||||||
posix_kill($process->getPid(), 9); // SIGKILL
|
posix_kill($process->getPid(), 9); // SIGKILL
|
||||||
|
|
||||||
@ -831,9 +831,8 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->fail('A RuntimeException should have been raised');
|
$this->fail('A RuntimeException should have been raised');
|
||||||
} catch (RuntimeException $e) {
|
} catch (RuntimeException $e) {
|
||||||
}
|
}
|
||||||
$duration = microtime(true) - $start;
|
|
||||||
|
|
||||||
$this->assertLessThan(3, $duration);
|
$this->assertLessThan(15, microtime(true) - $start);
|
||||||
|
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user