* Adjust unit test case error for ci.
This commit is contained in:
+2
-1
@@ -207,6 +207,7 @@ class ciModel extends model
|
||||
$pipeline = json_decode($compile->pipeline);
|
||||
$compile->project = isset($pipeline->project) ? (int)$pipeline->project : (int)$compile->pipeline;
|
||||
|
||||
$now = helper::now();
|
||||
$pipeline = $this->loadModel('gitlab')->apiGetSinglePipeline($compile->server, $compile->project, $compile->queue);
|
||||
if(!isset($pipeline->id) || isset($pipeline->message)) /* The pipeline is not available. */
|
||||
{
|
||||
@@ -214,7 +215,7 @@ class ciModel extends model
|
||||
return false;
|
||||
}
|
||||
|
||||
$now = helper::now();
|
||||
$jobs = $this->gitlab->apiGetJobs($compile->server, $compile->project, $compile->queue);
|
||||
$data = new stdclass;
|
||||
$data->status = $pipeline->status;
|
||||
$data->updateDate = $now;
|
||||
|
||||
@@ -53,7 +53,12 @@ class ciTest
|
||||
*/
|
||||
public function syncCompileStatusTest(int $compileID, int $MRID = 0): object|array
|
||||
{
|
||||
$compile = $this->objectModel->getCompileByID($compileID);
|
||||
$compile = $this->objectModel->dao->select('compile.*, job.engine,job.pipeline, pipeline.name as jenkinsName,job.server,pipeline.url,pipeline.account,pipeline.token,pipeline.password')
|
||||
->from(TABLE_COMPILE)->alias('compile')
|
||||
->leftJoin(TABLE_JOB)->alias('job')->on('compile.job=job.id')
|
||||
->leftJoin(TABLE_PIPELINE)->alias('pipeline')->on('job.server=pipeline.id')
|
||||
->where('compile.id')->eq($compileID)
|
||||
->fetch();
|
||||
|
||||
$this->objectModel->syncCompileStatus($compile, $MRID);
|
||||
$compile = $this->objectModel->loadModel('compile')->getByID($compileID);
|
||||
|
||||
@@ -17,6 +17,7 @@ cid=1
|
||||
include dirname(__FILE__, 5) . '/test/lib/init.php';
|
||||
include dirname(__FILE__, 2) . '/ci.class.php';
|
||||
|
||||
zdTable('pipeline')->gen(5);
|
||||
zdTable('repo')->config('repo')->gen(5);
|
||||
su('admin');
|
||||
|
||||
@@ -27,4 +28,4 @@ r($ci->setMenuTest(2)) && p('code:link') && e('代码|repo|browse|repoID=2'); //
|
||||
|
||||
r($ci->setMenuTest(5)) && p('mr') && e('~~'); // SVN代码库,不显示MR
|
||||
|
||||
r($ci->setMenuTest(2, 'gitlab')) && p('code:link') && e('代码|repo|browse|repoID=%s'); // DevOps模块主菜单不需要替换代码库ID
|
||||
r($ci->setMenuTest(2, 'gitlab')) && p('code:link') && e('代码|repo|browse|repoID=%s'); // DevOps模块主菜单不需要替换代码库ID
|
||||
|
||||
Reference in New Issue
Block a user