attempts to fix tests on Travis

schmittjoh · schmittjoh · commit 6c11207573a5 · 2013-08-03T09:57:35.000+02:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -120,6 +120,27 @@ class Process
         159 => 'Bad syscall',
     );
 
+    /**
+     * Returns whether PTY is supported on the current operating system.
+     *
+     * @return Boolean
+     */
+    public static function isPtySupported()
+    {
+        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+            return false;
+        }
+
+        $proc = @proc_open('echo 1', array(array('pty'), array('pty'), array('pty')), $pipes);
+        if (is_resource($proc)) {
+            proc_close($proc);
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Constructor.
      *
@@ -1183,7 +1204,7 @@ private function getDescriptors()
                 array('file', '/dev/tty', 'w'),
                 array('file', '/dev/tty', 'w'),
             );
-        } elseif ($this->pty) {
+        } elseif ($this->pty && self::isPtySupported()) {
             $descriptors = array(
                 array('pty'),
                 array('pty'),
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -205,8 +205,8 @@ public function testTTYCommand()
      */
     public function testPTYCommand()
     {
-        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
-            $this->markTestSkipped('Windows does not have PTY support.');
+        if ( ! Process::isPtySupported()) {
+            $this->markTestSkipped('PTY is not supported on this operating system.');
         }
 
         $process = $this->getProcess('echo "foo"');

Original file line number	Diff line number	Diff line change
`@@ -205,8 +205,8 @@ public function testTTYCommand()`
`205`	`205`	`*/`
`206`	`206`	`public function testPTYCommand()`
`207`	`207`	`{`
`208`		`- if (defined('PHP_WINDOWS_VERSION_BUILD')) {`
`209`		`- $this->markTestSkipped('Windows does not have PTY support.');`
	`208`	`+ if ( ! Process::isPtySupported()) {`
	`209`	`+ $this->markTestSkipped('PTY is not supported on this operating system.');`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`$process = $this->getProcess('echo "foo"');`