Pārlūkot izejas kodu

merged branch bdmu/ticket_5343 (PR #5344)

Commits
-------

f694615 [Process] fix ProcessTest::testProcessPipes hangs on Windows on branch 2.0

Discussion
----------

[Process] fix ProcessTest::testProcessPipes hangs on Windows on branch 2.0

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5343
Todo: -
License of the code: MIT
Documentation PR:
Marked the test as skipped on Windows, exactly as it is done on master branch (kind of backport)

---------------------------------------------------------------------------

by pborreli at 2012-08-25T20:06:58Z

:+1:
Fabien Potencier 12 gadi atpakaļ
vecāks
revīzija
04c46ebd33

+ 2 - 2
tests/Symfony/Tests/Component/Process/ProcessTest.php

@@ -55,8 +55,8 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testProcessPipes($expected, $code)
     {
-        if (strpos(PHP_OS, "WIN") === 0 && version_compare(phpversion(), "5.3.9", "<")) {
-            $this->markTestSkipped('Test hangs on Windows & PHP due to https://bugs.php.net/bug.php?id=60120 fixed in http://svn.php.net/viewvc?view=revision&revision=318366');
+        if (strpos(PHP_OS, "WIN") === 0) {
+            $this->markTestSkipped('Test hangs on Windows & PHP due to https://bugs.php.net/bug.php?id=60120 and https://bugs.php.net/bug.php?id=51800');
         }
 
         $p = new Process(sprintf('php -r %s', escapeshellarg($code)));