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

fix(测试计划状态): 优化测试计划的执行状态检查 

优化测试计划的执行状态检查，如果测试计划中包含性能测试，那么不再提前结束任务，以性能测试最终结束时间或测试计划超时时间为准
This commit is contained in:
song-tianyang 2021-12-07 20:45:15 +08:00 committed by song-tianyang
parent 64ca006ed1
commit 97ea6bae07
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -1222,22 +1222,10 @@ public class TestPlanReportService {
} }
if (StringUtils.isNotBlank(testPlanReportContent.getLoadAllCases())) { if (StringUtils.isNotBlank(testPlanReportContent.getLoadAllCases())) {
reportHasData = true;
List<TestPlanLoadCaseDTO> allCases = JSONObject.parseArray(testPlanReportContent.getLoadAllCases(), TestPlanLoadCaseDTO.class); List<TestPlanLoadCaseDTO> allCases = JSONObject.parseArray(testPlanReportContent.getLoadAllCases(), TestPlanLoadCaseDTO.class);
for (TestPlanLoadCaseDTO dto : allCases) { if(!allCases.isEmpty()){
if (StringUtils.equalsIgnoreCase(dto.getStatus(), "run")) { isTaskRunning = true;
isUpdate = true;
LoadTestReport report = loadTestReportMapper.selectByPrimaryKey(dto.getReportId());
if (report != null) {
dto.setStatus(report.getStatus());
}
}
if (StringUtils.equalsAnyIgnoreCase("Underway", dto.getStatus(), dto.getStatus())) {
isTaskRunning = true;
}
} }
testPlanReportContent.setLoadAllCases(JSONArray.toJSONString(allCases));
} }
if (isUpdate) { if (isUpdate) {
testPlanReportContentMapper.updateByPrimaryKeyWithBLOBs(testPlanReportContent); testPlanReportContentMapper.updateByPrimaryKeyWithBLOBs(testPlanReportContent);