Merge branch '2.7' into 2.8

stof · stof · commit 27ba4b29f0e8 · 2015-12-05T19:11:45.000+01:00
* 2.7:
  Fix the exception message expectation
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -762,8 +762,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()
     {
@@ -801,8 +801,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
`@@ -762,8 +762,8 @@ public function testRestart()`
`762`	`762`	`}`
`763`	`763`
`764`	`764`	`/**`
`765`		`- * @expectedException Symfony\Component\Process\Exception\RuntimeException`
`766`		`- * @expectedExceptionMessage The process timed-out.`
	`765`	`+ * @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException`
	`766`	`+ * @expectedExceptionMessage exceeded the timeout of 0.5 seconds.`
`767`	`767`	`*/`
`768`	`768`	`public function testRunProcessWithTimeout()`
`769`	`769`	`{`
`@@ -801,8 +801,8 @@ public function testCheckTimeoutOnTerminatedProcess()`
`801`	`801`	`}`
`802`	`802`
`803`	`803`	`/**`
`804`		`- * @expectedException Symfony\Component\Process\Exception\RuntimeException`
`805`		`- * @expectedExceptionMessage The process timed-out.`
	`804`	`+ * @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException`
	`805`	`+ * @expectedExceptionMessage exceeded the timeout of 0.5 seconds.`
`806`	`806`	`*/`
`807`	`807`	`public function testCheckTimeoutOnStartedProcess()`
`808`	`808`	`{`