Browse Source

Removed unnecessary test and just check for return code

Fabian Grutschus 11 years ago
parent
commit
20854a50b4
2 changed files with 3 additions and 19 deletions
  1. 1 4
      src/Composer/Util/Perforce.php
  2. 2 15
      tests/Composer/Test/Util/PerforceTest.php

+ 1 - 4
src/Composer/Util/Perforce.php

@@ -367,10 +367,7 @@ class Perforce
 
     public static function checkServerExists($url, ProcessExecutor $processExecutor)
     {
-        $result = '';
-        $exitCode = $processExecutor->execute('p4 -p ' . $url . ' info -s', $result);
-
-        return false === strpos($result, 'error') && 0 === $exitCode;
+        return 0 === $processExecutor->execute('p4 -p ' . $url . ' info -s');
     }
 
     public function getComposerInformation($identifier)

+ 2 - 15
tests/Composer/Test/Util/PerforceTest.php

@@ -617,20 +617,6 @@ class PerforceTest extends \PHPUnit_Framework_TestCase
         $result = $this->perforce->checkServerExists('perforce.does.exist:port', $processExecutor);
         $this->assertTrue($result);
     }
-
-    public function testCheckServerExistsWithFailure()
-    {
-        $processExecutor = $this->getMock('Composer\Util\ProcessExecutor');
-
-        $expectedCommand = 'p4 -p perforce.does.not.exist:port info -s';
-        $processExecutor->expects($this->at(0))
-            ->method('execute')
-            ->with($this->equalTo($expectedCommand), $this->equalTo(null))
-            ->will($this->returnValue('Perforce client error:'));
-
-        $result = $this->perforce->checkServerExists('perforce.does.not.exist:port', $processExecutor);
-        $this->assertTrue($result);
-    }
     
     /**
      * Test if "p4" command is missing.
@@ -639,13 +625,14 @@ class PerforceTest extends \PHPUnit_Framework_TestCase
      * 
      * @return void
      */
-    public function testCheckServerExistsWithMissingPerforceClient()
+    public function testCheckServerClientError()
     {
         $processExecutor = $this->getMock('Composer\Util\ProcessExecutor');
 
         $expectedCommand = 'p4 -p perforce.does.exist:port info -s';
         $processExecutor->expects($this->at(0))
             ->method('execute')
+            ->with($this->equalTo($expectedCommand), $this->equalTo(null))
             ->will($this->returnValue(127));
         
         $result = $this->perforce->checkServerExists('perforce.does.exist:port', $processExecutor);