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

Fix

Browse source
This commit is contained in:
Dan Cryer 2015-10-09 10:37:50 +01:00
parent f747371c6d
commit fbc3da59dd
3 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
PHPCI/Model/Build.php
View file

@ -249,25 +249,4 @@ class Build extends BuildBase
exec(sprintf(IS_WIN ? 'rmdir /S /Q "%s"' : 'rm -Rf "%s"', $buildPath)); exec(sprintf(IS_WIN ? 'rmdir /S /Q "%s"' : 'rm -Rf "%s"', $buildPath));
} }
/**
* @param Project $value
*/
public function setProjectObject(\PHPCI\Model\Project $value)
{
$this->data['project'] = $value;
return parent::setProjectObject($value);
}
/**
* Get the Project model for this Build by Id.
*/
public function getProject()
{
if (empty($this->data['project'])) {
$this->data['project'] = parent::getProject();
}
return $this->data['project'];
}
} }

20
PHPCI/Service/BuildService.php
View file

@ -87,9 +87,13 @@ class BuildService
$build = $this->buildStore->save($build); $build = $this->buildStore->save($build);
$build = BuildFactory::getBuild($build); $buildId = $build->getId();
$build->sendStatusPostback();
$this->addBuildToQueue($build); if (!empty($buildId)) {
$build = BuildFactory::getBuild($build);
$build->sendStatusPostback();
$this->addBuildToQueue($build);
}
return $build; return $build;
} }
@ -116,9 +120,13 @@ class BuildService
$build = $this->buildStore->save($build); $build = $this->buildStore->save($build);
$build = BuildFactory::getBuild($build); $buildId = $build->getId();
$build->sendStatusPostback();
$this->addBuildToQueue($build); if (!empty($buildId)) {
$build = BuildFactory::getBuild($build);
$build->sendStatusPostback();
$this->addBuildToQueue($build);
}
return $build; return $build;
} }

6
Tests/PHPCI/Service/BuildServiceTest.php
View file

@ -101,13 +101,9 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
*/ */
public function testExecute_CreateDuplicateBuild() public function testExecute_CreateDuplicateBuild()
{ {
$project = new Project();
$project->setType('hg');
$project->setId(101);
$build = new Build(); $build = new Build();
$build->setId(1); $build->setId(1);
$build->setProject($project); $build->setProject(101);
$build->setCommitId('abcde'); $build->setCommitId('abcde');
$build->setStatus(Build::STATUS_FAILED); $build->setStatus(Build::STATUS_FAILED);
$build->setLog('Test'); $build->setLog('Test');