Merge branch '3.0'

stof · stof · commit c3b60a9ff86f · 2015-12-05T19:15:19.000+01:00
* 3.0:
  Fix the exception message expectation
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -744,8 +744,8 @@ public function testRestart()
     }
 
     /**
-     * @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 @@ public function testCheckTimeoutOnTerminatedProcess()
     }
 
     /**
-     * @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()
     {

Original file line number	Diff line number	Diff line change
`@@ -744,8 +744,8 @@ public function testRestart()`
`744`	`744`	`}`
`745`	`745`
`746`	`746`	`/**`
`747`		`- * @expectedException Symfony\Component\Process\Exception\RuntimeException`
`748`		`- * @expectedExceptionMessage The process timed-out.`
	`747`	`+ * @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException`
	`748`	`+ * @expectedExceptionMessage exceeded the timeout of 0.5 seconds.`
`749`	`749`	`*/`
`750`	`750`	`public function testRunProcessWithTimeout()`
`751`	`751`	`{`
`@@ -783,8 +783,8 @@ public function testCheckTimeoutOnTerminatedProcess()`
`783`	`783`	`}`
`784`	`784`
`785`	`785`	`/**`
`786`		`- * @expectedException Symfony\Component\Process\Exception\RuntimeException`
`787`		`- * @expectedExceptionMessage The process timed-out.`
	`786`	`+ * @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException`
	`787`	`+ * @expectedExceptionMessage exceeded the timeout of 0.5 seconds.`
`788`	`788`	`*/`
`789`	`789`	`public function testCheckTimeoutOnStartedProcess()`
`790`	`790`	`{`