Skip to content

Commit

Permalink
[Process] Fixed ProcessFailedException not populating exception messa…
Browse files Browse the repository at this point in the history
…ge due to a missing sprintf parameter
  • Loading branch information
proofek committed Apr 25, 2012
1 parent 76ef8da commit 1c03a16
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 1 deletion.
Expand Up @@ -28,7 +28,12 @@ public function __construct(Process $process)
throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.');
}

parent::__construct(sprintf('The command "%s" failed.'."\n\nOutput:\n================\n".$process->getOutput()."\n\nError Output:\n================\n".$process->getErrorOutput()));
parent::__construct(
sprintf(
'The command "%s" failed.'."\n\nOutput:\n================\n".$process->getOutput()."\n\nError Output:\n================\n".$process->getErrorOutput(),
$process->getCommandLine()
)
);

$this->process = $process;
}
Expand Down
75 changes: 75 additions & 0 deletions src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
@@ -0,0 +1,75 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\Process\Tests;

use Symfony\Component\Process\Process,
Symfony\Component\Process\Exception\ProcessFailedException;

/**
* @author Sebastian Marek <proofek@gmail.com>
*/
class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
{
/**
* tests ProcessFailedException throws exception if the process was successful
*/
public function testProcessFailedExceptionThrowsException()
{
$process = $this->getMock(
'Symfony\Component\Process\Process',
array('isSuccessful'),
array('php')
);
$process->expects($this->once())
->method('isSuccessful')
->will($this->returnValue(true));

$this->setExpectedException(
'\InvalidArgumentException',
'Expected a failed process, but the given process was successful.'
);
$exception = new ProcessFailedException($process);
}

/**
* tests ProcessFailedException uses information from process output
* to generate exception message
*/
public function testProcessFailedExceptionPopulatesInformationFromProcessOutput()
{
$cmd = 'php';
$output = "Command output";
$errorOutput = "FATAL: Unexpected error";

$process = $this->getMock(
'Symfony\Component\Process\Process',
array('isSuccessful', 'getOutput', 'getErrorOutput'),
array($cmd)
);
$process->expects($this->once())
->method('isSuccessful')
->will($this->returnValue(false));
$process->expects($this->once())
->method('getOutput')
->will($this->returnValue($output));
$process->expects($this->once())
->method('getErrorOutput')
->will($this->returnValue($errorOutput));

$exception = new ProcessFailedException($process);

$this->assertEquals(
"The command \"$cmd\" failed.\n\nOutput:\n================\n{$output}\n\nError Output:\n================\n{$errorOutput}",
$exception->getMessage()
);
}
}

0 comments on commit 1c03a16

Please sign in to comment.