public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fixing delete client workspace bug.

pull/2834/head
Clark Stuth 2014-03-19 13:58:41 -05:00
parent 14a6406f9b
commit c1a8b4645c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Util/Perforce.php
View File

@ -111,7 +111,9 @@ class Perforce
public function cleanupClientSpec() public function cleanupClientSpec()
{ {
$client = $this->getClient(); $client = $this->getClient();
$command = 'p4 client -d ' . $client; $task = 'client -d ' . $client;
$useP4Client = false;
$command = $this->generateP4Command($task, $useP4Client);
$this->executeCommand($command); $this->executeCommand($command);
$clientSpec = $this->getP4ClientSpec(); $clientSpec = $this->getP4ClientSpec();
$fileSystem = $this->getFilesystem(); $fileSystem = $this->getFilesystem();

2
tests/Composer/Test/Util/PerforceTest.php
View File

@ -686,7 +686,7 @@ class PerforceTest extends \PHPUnit_Framework_TestCase
$this->perforce->setFilesystem($fs); $this->perforce->setFilesystem($fs);
$testClient = $this->perforce->getClient(); $testClient = $this->perforce->getClient();
$expectedCommand = 'p4 client -d ' . $testClient; $expectedCommand = 'p4 -u ' . self::TEST_P4USER . ' -p ' . self::TEST_PORT . ' client -d ' . $testClient;
$this->processExecutor->expects($this->once())->method('execute')->with($this->equalTo($expectedCommand)); $this->processExecutor->expects($this->once())->method('execute')->with($this->equalTo($expectedCommand));
$fs->expects($this->once())->method('remove')->with($this->perforce->getP4ClientSpec()); $fs->expects($this->once())->method('remove')->with($this->perforce->getP4ClientSpec());