* [task#122574,done,0.5h] Fix unit test for devops.
This commit is contained in:
@@ -340,9 +340,10 @@ class compileModel extends model
|
||||
$compileID = $compile->id;
|
||||
$repo = $this->loadModel('repo')->getByID($job->repo);
|
||||
|
||||
$this->loadModel('job');
|
||||
if($job->triggerType == 'tag')
|
||||
{
|
||||
$lastTag = $this->loadModel('job')->getLastTagByRepo($repo, $job);
|
||||
$lastTag = $this->job->getLastTagByRepo($repo, $job);
|
||||
if($lastTag)
|
||||
{
|
||||
$job->lastTag = $lastTag;
|
||||
@@ -353,9 +354,9 @@ class compileModel extends model
|
||||
}
|
||||
|
||||
$method = 'exec' . ucfirst($job->engine) . 'Pipeline';
|
||||
if(!method_exists($this, $method)) return false;
|
||||
if(!method_exists($this->job, $method)) return false;
|
||||
|
||||
$result = $this->loadModel('job')->$method($job, $repo, $compileID, $result);
|
||||
$result = $this->job->$method($job, $repo, $compileID);
|
||||
|
||||
$this->dao->update(TABLE_COMPILE)->data($result)->where('id')->eq($compileID)->exec();
|
||||
$this->dao->update(TABLE_JOB)
|
||||
|
||||
@@ -42,4 +42,4 @@ $compile = new compileTest();
|
||||
|
||||
r($compile->execTest($compile1)) && p() && e('0'); //检测job不存在时是否能执行编译
|
||||
r($compile->execTest($compile2)) && p() && e('1'); //检测job存在但是$compile->id不等于$compile->job是否能执行编译
|
||||
r($compile->execTest($compile3)) && p() && e('1'); //检测job存在同时$compile->id等于$compile->job是否能执行编译
|
||||
r($compile->execTest($compile3)) && p() && e('1'); //检测job存在同时$compile->id等于$compile->job是否能执行编译
|
||||
|
||||
@@ -28,6 +28,7 @@ include dirname(__FILE__, 5) . '/test/lib/init.php';
|
||||
include dirname(__FILE__, 2) . '/lib/compile.unittest.class.php';
|
||||
|
||||
zenData('compile')->gen(0);
|
||||
zenData('user')->gen(10);
|
||||
su('admin');
|
||||
|
||||
$compile = new compileTest();
|
||||
@@ -60,4 +61,4 @@ r($compileInfo) && p('name,job,createdBy,queue,status') && e('testName2,2,admin,
|
||||
|
||||
$compile->createByBuildInfo($nameList[2], $objectIDList[2], $buildList[2], $buildTypeList[2]);
|
||||
$compileInfo = $tester->dao->select('*')->from(TABLE_COMPILE)->where('id')->eq(2)->fetch();
|
||||
r($compileInfo) && p('name,job,createdBy,queue,status') && e('testName3,3,admin,1,failure'); //测试当buildTType为jenkins的时候,判断创建的compile信息是否正确,是否与build内的信息一致。
|
||||
r($compileInfo) && p('name,job,createdBy,queue,status') && e('testName3,3,admin,1,failure'); //测试当buildTType为jenkins的时候,判断创建的compile信息是否正确,是否与build内的信息一致。
|
||||
|
||||
Reference in New Issue
Block a user