deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

extracted command formation into a method

Browse source
This commit is contained in:
Brian Danchilla 2016-09-27 10:57:40 -06:00
parent 1446974db9
commit 8127130bf9
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
PHPCI/Plugin/Paratest.php
View file

@ -13,7 +13,10 @@ use PHPCI\Plugin\Util\JUnitParser;
*/ */
class Paratest extends PhpUnit class Paratest extends PhpUnit
{ {
//TODO make these configurable
protected $log_file = "junit.log"; protected $log_file = "junit.log";
protected $phpunit_config_file = "phpunit-parallel.xml";
protected $number_processes = 4;
/** /**
* Runs PHP Unit tests in a specified directory, optionally using specified config file(s). * Runs PHP Unit tests in a specified directory, optionally using specified config file(s).
@ -75,9 +78,8 @@ class Paratest extends PhpUnit
chdir($this->phpci->buildPath . DIRECTORY_SEPARATOR . $this->runFrom); chdir($this->phpci->buildPath . DIRECTORY_SEPARATOR . $this->runFrom);
} }
$paratest = $this->phpci->findBinary('paratest'); $cmd = $this->getParatestCommand();
$cmd = $paratest . ' -c phpunit-parallel.xml -p 4 --stop-on-failure --log-junit ' . $this->log_file;
$success = $this->phpci->executeCommand($cmd, $this->args, $this->phpci->buildPath . $configPath); $success = $this->phpci->executeCommand($cmd, $this->args, $this->phpci->buildPath . $configPath);
if ($this->runFrom) { if ($this->runFrom) {
@ -101,12 +103,18 @@ class Paratest extends PhpUnit
$curdir = getcwd(); $curdir = getcwd();
chdir($this->phpci->buildPath); chdir($this->phpci->buildPath);
$paratest = $this->phpci->findBinary('paratest'); $cmd = $this->getParatestCommand();
$cmd = $paratest . ' -c phpunit-parallel.xml -p 4 --stop-on-failure --log-junit ' . $this->log_file;
$success = $this->phpci->executeCommand($cmd, $this->args, $this->phpci->buildPath . $directory); $success = $this->phpci->executeCommand($cmd, $this->args, $this->phpci->buildPath . $directory);
chdir($curdir); chdir($curdir);
return $success; return $success;
} }
} }
protected function getParatestCommand(){
$paratest = $this->phpci->findBinary('paratest');
$cmd = $paratest . ' -c ' . $this->phpunit_config_file . ' -p ' . $this->number_processes . ' --stop-on-failure --log-junit ' . $this->log_file;
return $cmd;
}
} }