test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口测试): 测试计划执行，资源池不可用，任务状态显示有误 

--bug=1047861 --user=陈建星 【测试计划】资源池被禁用-执行计划-任务数据问题汇总 https://www.tapd.cn/55049933/s/1596223
This commit is contained in:
AgAngle 2024-10-23 11:23:20 +08:00 committed by Craftsman
parent 4aabe786a0
commit 6293dd63fa
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiBatchRunBaseService.java
View File

@ -209,24 +209,31 @@ public class ApiBatchRunBaseService {
return runModeConfig.getEnvironmentId(); return runModeConfig.getEnvironmentId();
} }
public void updateTaskStatus(String taskId) { public void updateTaskCompletedStatus(String taskId) {
// 更新任务状态 // 删除执行缓存
ExecTask execTask = new ExecTask(); removeRunningTaskCache(taskId);
execTask.setEndTime(System.currentTimeMillis()); ExecTask originExecTask = execTaskMapper.selectByPrimaryKey(taskId);
execTask.setId(taskId); // 出现异常，导致任务没有开始，则不更新任务状态
execTask.setStatus(ExecStatus.COMPLETED.name()); if (!StringUtils.equals(originExecTask.getStatus(), ExecStatus.PENDING.name())) {
if (extExecTaskItemMapper.hasErrorItem(taskId)) { // 更新任务状态
execTask.setResult(ResultStatus.ERROR.name()); ExecTask execTask = new ExecTask();
} else if (extExecTaskItemMapper.hasFakeErrorItem(taskId)) { execTask.setEndTime(System.currentTimeMillis());
execTask.setResult(ResultStatus.FAKE_ERROR.name()); execTask.setId(taskId);
} else { execTask.setStatus(ExecStatus.COMPLETED.name());
execTask.setResult(ResultStatus.SUCCESS.name()); if (extExecTaskItemMapper.hasErrorItem(taskId)) {
execTask.setResult(ResultStatus.ERROR.name());
} else if (extExecTaskItemMapper.hasFakeErrorItem(taskId)) {
execTask.setResult(ResultStatus.FAKE_ERROR.name());
} else {
execTask.setResult(ResultStatus.SUCCESS.name());
}
execTaskMapper.updateByPrimaryKeySelective(execTask);
} }
execTaskMapper.updateByPrimaryKeySelective(execTask);
} }
/** /**
* 清理正在运行的任务缓存 * 清理正在运行的任务缓存
*
* @param taskId * @param taskId
*/ */
public void removeRunningTaskCache(String taskId) { public void removeRunningTaskCache(String taskId) {

3
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseBatchRunService.java
View File

@ -175,8 +175,7 @@ public class TestPlanApiCaseBatchRunService {
ExecutionQueue collectionQueue = apiExecutionQueueService.getQueue(collectionQueueId); ExecutionQueue collectionQueue = apiExecutionQueueService.getQueue(collectionQueueId);
if (collectionQueue == null) { if (collectionQueue == null) {
// 失败停止，或者执行完成，更新任务状态 // 失败停止，或者执行完成，更新任务状态
apiBatchRunBaseService.updateTaskStatus(collectionQueueId); apiBatchRunBaseService.updateTaskCompletedStatus(collectionQueueId);
apiBatchRunBaseService.removeRunningTaskCache(collectionQueueId);
return; return;
} }
String userId = collectionQueue.getUserId(); String userId = collectionQueue.getUserId();

3
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioBatchRunService.java
View File

@ -200,8 +200,7 @@ public class TestPlanApiScenarioBatchRunService {
ExecutionQueue collectionQueue = apiExecutionQueueService.getQueue(collectionQueueId); ExecutionQueue collectionQueue = apiExecutionQueueService.getQueue(collectionQueueId);
if (collectionQueue == null) { if (collectionQueue == null) {
// 失败停止，或者执行完成，更新任务状态 // 失败停止，或者执行完成，更新任务状态
apiBatchRunBaseService.updateTaskStatus(collectionQueueId); apiBatchRunBaseService.updateTaskCompletedStatus(collectionQueueId);
apiBatchRunBaseService.removeRunningTaskCache(collectionQueueId);
return; return;
} }
String userId = collectionQueue.getUserId(); String userId = collectionQueue.getUserId();

3
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanExecuteService.java
View File

@ -687,8 +687,7 @@ public class TestPlanExecuteService {
TestPlanReport testPlanReport = testPlanReportMapper.selectByPrimaryKey(reportId); TestPlanReport testPlanReport = testPlanReportMapper.selectByPrimaryKey(reportId);
if (StringUtils.equals(testPlanReport.getParentId(), reportId) && StringUtils.isNotBlank(taskId)) { if (StringUtils.equals(testPlanReport.getParentId(), reportId) && StringUtils.isNotBlank(taskId)) {
// 执行完成，更新任务状态 // 执行完成，更新任务状态
apiBatchRunBaseService.updateTaskStatus(taskId); apiBatchRunBaseService.updateTaskCompletedStatus(taskId);
apiBatchRunBaseService.removeRunningTaskCache(taskId);
} }
testPlanExecuteSupportService.summaryTestPlanReport(reportId, isGroupReport, isStop); testPlanExecuteSupportService.summaryTestPlanReport(reportId, isGroupReport, isStop);
} }