Merge branch '2.8' into 3.0

* 2.8:
  Fix the exception message expectation
This commit is contained in:
Christophe Coevoet 2015-12-05 19:14:16 +01:00
commit 05aff6a19c

View File

@ -744,8 +744,8 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedExceptionMessage The process timed-out.
* @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException
* @expectedExceptionMessage exceeded the timeout of 0.5 seconds.
*/
public function testRunProcessWithTimeout()
{
@ -783,8 +783,8 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedExceptionMessage The process timed-out.
* @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException
* @expectedExceptionMessage exceeded the timeout of 0.5 seconds.
*/
public function testCheckTimeoutOnStartedProcess()
{